diff --git a/irssi-version.h.in b/irssi-version.h.in
index 349d8c92..82c80559 100644
--- a/irssi-version.h.in
+++ b/irssi-version.h.in
@@ -1,4 +1,3 @@
 /* automatically created by configure */
-#define IRSSI_VERSION "@VERSION@"
 #define IRSSI_VERSION_DATE @VERSION_DATE@
 #define IRSSI_VERSION_TIME @VERSION_TIME@
diff --git a/src/core/args.c b/src/core/args.c
index db547bad..f7410911 100644
--- a/src/core/args.c
+++ b/src/core/args.c
@@ -45,7 +45,7 @@ void args_execute(int argc, char *argv[])
 	if (iopt_tables == NULL)
 		return;
 
-	con = poptGetContext(PACKAGE, argc, argv,
+	con = poptGetContext(PACKAGE_TARNAME, argc, argv,
 			     (struct poptOption *) (iopt_tables->data), 0);
 	poptReadDefaultConfig(con, TRUE);
 
diff --git a/src/core/expandos.c b/src/core/expandos.c
index 5849bfba..136e1634 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -319,7 +319,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
 /* client version text string */
 static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
 {
-	return IRSSI_VERSION;
+	return PACKAGE_VERSION;
 }
 
 /* current value of CMDCHARS */
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index ea91b274..e20254ba 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -106,7 +106,7 @@ static void cmd_version(char *data)
 	if (*data == '\0') {
                 g_snprintf(time, sizeof(time), "%04d", IRSSI_VERSION_TIME);
 		printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
-			  "Client: "PACKAGE" " IRSSI_VERSION" (%d %s)",
+			  "Client: "PACKAGE_TARNAME" " PACKAGE_VERSION" (%d %s)",
 			  IRSSI_VERSION_DATE, time);
 	}
 }
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index 540aa67b..39f61c56 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -341,7 +341,7 @@ int main(int argc, char **argv)
 	args_execute(argc, argv);
 
  	if (version) {
-		printf(PACKAGE" " IRSSI_VERSION" (%d %04d)\n",
+		printf(PACKAGE_TARNAME" " PACKAGE_VERSION" (%d %04d)\n",
 		       IRSSI_VERSION_DATE, IRSSI_VERSION_TIME);
 		return 0;
 	}
diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c
index 3ec3219d..7d74495c 100644
--- a/src/irc/core/ctcp.c
+++ b/src/irc/core/ctcp.c
@@ -329,7 +329,7 @@ void ctcp_init(void)
 	ctcp_cmds = NULL;
 
 	settings_add_str("misc", "ctcp_version_reply",
-			 PACKAGE" v$J - running on $sysname $sysarch");
+			 PACKAGE_TARNAME" v$J - running on $sysname $sysarch");
 	settings_add_str("misc", "ctcp_userinfo_reply", "$Y");
 	settings_add_int("flood", "max_ctcp_queue", 5);
 
diff --git a/src/irc/proxy/dump.c b/src/irc/proxy/dump.c
index 94b0e5b3..a7a996d5 100644
--- a/src/irc/proxy/dump.c
+++ b/src/irc/proxy/dump.c
@@ -243,12 +243,12 @@ void proxy_dump_data(CLIENT_REC *client)
 
 	/* welcome info */
 	proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network\n", client->proxy_address, client->nick);
-	proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, IRSSI_VERSION);
+	proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, PACKAGE_VERSION);
 	proxy_outdata(client, ":%s 003 %s :This server was created ...\n", client->proxy_address, client->nick);
 	if (client->server == NULL || !client->server->emode_known)
-		proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, IRSSI_VERSION);
+		proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
 	else
-		proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, IRSSI_VERSION);
+		proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
 
 	if (client->server != NULL && client->server->isupport_sent) {
 		isupport_out = g_string_new(NULL);