diff --git a/Changelog b/Changelog
index bbff926c8..ee4f08a61 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.2
+    - BUGFIX: Do not report PeX as being disabled when DHT is
+
 * Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1
     - BUGFIX: Really disable torrent addition dialog by default
     - BUGFIX: Fix some missing icons in the Web UI
diff --git a/src/qtlibtorrent/qbtsession.h b/src/qtlibtorrent/qbtsession.h
index 333b57687..3c8f70619 100644
--- a/src/qtlibtorrent/qbtsession.h
+++ b/src/qtlibtorrent/qbtsession.h
@@ -1,4 +1,4 @@
-/*
+e/*
  * Bittorrent Client using Qt4 and libtorrent.
  * Copyright (C) 2006  Christophe Dumez
  *
@@ -95,7 +95,7 @@ public:
   inline ScanFoldersModel* getScanFoldersModel() const {  return m_scanFolders; }
   inline bool isDHTEnabled() const { return DHTEnabled; }
   inline bool isLSDEnabled() const { return LSDEnabled; }
-  inline bool isPexEnabled() const { return DHTEnabled; }
+  inline bool isPexEnabled() const { return PeXEnabled; }
   inline bool isQueueingEnabled() const { return queueingEnabled; }
 
 public slots: