diff --git a/include/config.h b/include/config.h
index fb7f833ac..b0f20fcb5 100644
--- a/include/config.h
+++ b/include/config.h
@@ -467,6 +467,13 @@
 #define SPAMFILTER_DETECTSLOW
 #endif
 
+/* The 3.4-alpha* series, especially the first few, are highly experimental.
+ * If EXPERIMENTAL is #define'd then all users will receive a notice about
+ * this when they connect, along with a pointer to bugs.unrealircd.org where
+ * they can report any problems. This is mainly to help UnrealIRCd development.
+ */
+#define EXPERIMENTAL
+
 /* ------------------------- END CONFIGURATION SECTION -------------------- */
 #define MOTD MPATH
 #define RULES RPATH
diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index 827d0fb89..e9dfc25d2 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -1386,8 +1386,8 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 		short_motd(sptr);
 #ifdef EXPERIMENTAL
 		sendto_one(sptr,
-		    ":%s NOTICE %s :*** \2NOTE:\2 This server (%s) is running experimental IRC server software. If you find any bugs or problems, please mail unreal-dev@lists.sourceforge.net about it",
-		    me.name, sptr->name, me.name);
+		    ":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (Unreal%s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/",
+		    me.name, sptr->name, VERSIONONLY);
 #endif
 #ifdef HOSTILENAME
 		/*