diff --git a/ChangeLog b/ChangeLog
index f4c13a0..d4fc4cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 Version 1.6.7
 *******************************************************************************
 
+2010-03-27 Nick Leverton <nick@leverton.org>
+	Subscription auto-renewals copy the renewal time from old subscription.
+
 2010-03-27 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	Backport of svn revision 527:
 	* Added API to ithread, created the following functions:
diff --git a/upnp/src/gena/gena_ctrlpt.c b/upnp/src/gena/gena_ctrlpt.c
index 38a43b9..f2751c5 100644
--- a/upnp/src/gena/gena_ctrlpt.c
+++ b/upnp/src/gena/gena_ctrlpt.c
@@ -80,6 +80,7 @@ static void GenaAutoRenewSubscription(
 		eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED;
 	} else {
 		UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, "GENA AUTO RENEW");
+		timeout = sub_struct->TimeOut;
 		errCode = genaRenewSubscription(
 			event->handle,
 			sub_struct->Sid,