diff --git a/ChangeLog b/ChangeLog
index a016148614..2c5607c3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in version 0.1.2.9-??? - 2007-??-??
+  o Minor bugfixes (server):
+    - Do not rotate onion key immediately after setting it for the first
+      time.
+
+
 Changes in version 0.1.2.8-beta - 2007-02-26
   o Major bugfixes (crashes):
     - Stop crashing when the controller asks us to resetconf more than
diff --git a/src/or/router.c b/src/or/router.c
index 0c0f4c986d..881fc9301e 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -291,7 +291,7 @@ init_keys(void)
      * or it's a holdover from 0.1.2.4-alpha-dev or earlier.  In either case,
      * start the clock ticking now so that we will eventually rotate it even
      * if we don't stay up for a full MIN_ONION_KEY_LIFETIME. */
-    state->LastRotatedOnionKey = time(NULL);
+    state->LastRotatedOnionKey = onionkey_set_at = time(NULL);
     or_state_mark_dirty(state, options->AvoidDiskWrites ? time(NULL)+3600 : 0);
   }