diff --git a/src/core/expandos.c b/src/core/expandos.c
index 2dbb252e..1dbd95ac 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -469,7 +469,7 @@ void expandos_deinit(void)
 
 	expando_destroy("sysname", expando_sysname);
 	expando_destroy("sysrelease", expando_sysrelease);
-	expando_destroy("topic", expando_servertag);
+	expando_destroy("topic", expando_topic);
 	expando_destroy("tag", expando_servertag);
 	expando_destroy("chatnet", expando_chatnet);
 
diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am
index f54f5958..90a356ce 100644
--- a/src/fe-common/core/Makefile.am
+++ b/src/fe-common/core/Makefile.am
@@ -14,6 +14,7 @@ libfe_common_core_a_SOURCES = \
 	fe-channels.c \
 	fe-common-core.c \
 	fe-core-commands.c \
+	fe-expandos.c \
 	fe-ignore.c \
 	fe-ignore-messages.c \
 	fe-log.c \
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index e7f7e867..aa099401 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -47,6 +47,9 @@ void fe_channels_deinit(void);
 void fe_core_log_init(void);
 void fe_core_log_deinit(void);
 
+void fe_expandos_init(void);
+void fe_expandos_deinit(void);
+
 void fe_ignore_init(void);
 void fe_ignore_deinit(void);
 
@@ -106,6 +109,7 @@ void fe_common_core_init(void)
 	keyboard_init();
 	printtext_init();
 	formats_init();
+        fe_expandos_init();
 	fe_ignore_init();
 	fe_log_init();
 	fe_modules_init();
@@ -135,6 +139,7 @@ void fe_common_core_deinit(void)
 	keyboard_deinit();
 	printtext_deinit();
 	formats_deinit();
+        fe_expandos_deinit();
 	fe_ignore_deinit();
 	fe_log_deinit();
 	fe_modules_deinit();
diff --git a/src/fe-common/core/fe-expandos.c b/src/fe-common/core/fe-expandos.c
new file mode 100644
index 00000000..c90fa23c
--- /dev/null
+++ b/src/fe-common/core/fe-expandos.c
@@ -0,0 +1,41 @@
+/*
+ fe-expandos.c : irssi
+
+    Copyright (C) 2000 Timo Sirainen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include "module.h"
+#include "expandos.h"
+#include "fe-windows.h"
+
+/* Window ref# */
+static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)
+{
+        *free_ret = TRUE;
+	return g_strdup_printf("%d", active_win->refnum);
+}
+
+void fe_expandos_init(void)
+{
+	expando_create("winref", expando_winref,
+		       "window changed", EXPANDO_ARG_NONE, NULL);
+}
+
+void fe_expandos_deinit(void)
+{
+	expando_destroy("winref", expando_winref);
+}