diff --git a/ChangeLog b/ChangeLog
index a43bb5cccf..08e2736023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.1.2.5-xxxx - 200?-??-??
+  o Minor bugfixes;
+    - Fix a bug when a PF socket is first used.  (Patch from Fabian
+      Keil)
+
 Changes in version 0.1.2.4-alpha - 2006-12-03
   o Major features:
     - Add support for using natd; this allows FreeBSDs earlier than
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 94b52444c1..d6f0ea5db1 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1310,6 +1310,7 @@ get_pf_socket(void)
   }
 
   pf_socket = pf;
+  return pf_socket;
 }
 #endif