diff --git a/TODO b/TODO
index 02ec8b506..52bb8d4ab 100644
--- a/TODO
+++ b/TODO
@@ -44,7 +44,6 @@
 - Add checking icon to documentation
 * beta3
   - Translations update (IN PROGRESS)
-  - Really enable UPnP/LSD/NAT-PMP (recently disabled as a default in libtorrent)
   - make use of finishedChecking alert if hydri implements it
   - Clean up delayed progress column sorting code
   - Clean up pause after checking code
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 068acaeb0..25b2c3364 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -52,6 +52,10 @@ bittorrent::bittorrent(){
   s = new session(fingerprint("qB", VERSION_MAJOR, VERSION_MINOR, VERSION_BUGFIX, 0));
   // Set severity level of libtorrent session
   s->set_severity_level(alert::info);
+  // Enable LSD/UPnP/NAT-PMP
+  s->start_lsd();
+  s->start_natpmp();
+  s->start_upnp();
   // DHT (Trackerless), disabled until told otherwise
   DHTEnabled = false;
   // Enabling metadata plugin