diff --git a/src/modules/extra/atheme2anope/atheme2anope.c b/src/modules/extra/atheme2anope/atheme2anope.c
index 9de28cfe4..6430f2a6d 100644
--- a/src/modules/extra/atheme2anope/atheme2anope.c
+++ b/src/modules/extra/atheme2anope/atheme2anope.c
@@ -3,8 +3,7 @@
  *   (C) Copyright 2009, the Anope team (team@anope.org) 
  *
  *
- *   This program is free software; you can redistribute it and/or 
-modify
+ *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License (see it online
  *   at http://www.gnu.org/copyleft/gpl.html) as published by the Free
  *   Software Foundation;
@@ -63,7 +62,7 @@ int AnopeInit(int argc, char **argv)
 			CNicks, CChannels, CAkills);
 
 		quitmsg = calloc(50, 1);
-		sprintf(quitmsg, "%s", "Shutting down to convert databases...");
+		snprintf(quitmsg, 50, "Shutting down to convert databases...");
 
 		save_data = 1;
 		delayed_quit = 1;
@@ -550,7 +549,7 @@ void WriteAkill(char *line)
 {
 	char *tok;
 	Akill *entry;
-	time_t t = time(NULL), j;
+	time_t t = time(NULL);
 
 	tok = strtok(line, " ");
 
@@ -571,14 +570,10 @@ void WriteAkill(char *line)
 				if (!stricmp(tok, "0"))
 					entry->expires = 0;
 				else
-				{
-					j = (time_t)tok;
-					entry->expires = (t + j);
-				}
+					entry->expires = t + atol(tok);
 
 				tok = strtok(NULL, " ");
-				j = (time_t)tok;
-				entry->seton = j;
+				entry->seton = atol(tok);
 
 				tok = strtok(NULL, " ");
 				entry->user = sstrdup("*");
diff --git a/version.log b/version.log
index 234d5d97c..439a08fe2 100644
--- a/version.log
+++ b/version.log
@@ -9,9 +9,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="4"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2943"
+VERSION_BUILD="2946"
 
 # $Log$ # Changes since the 1.8.4 Release
+#Revision 2946 - Fixed bug #1161 - Fixed setting expiry times on akills in the atheme2anope database converter
 #Revision 2943 - Added an Atheme to Anope database converter
 #Revision 2935 - Fixed unloading modules commands, fixes a crash introduced by the last commit
 #Revision 2931 - Always set mod_current_module and mod_current_module_name, fixes a few of the functions in modules.c relying on it.