diff --git a/Makefile.am b/Makefile.am
index 3f7485d8..d42d0560 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 bin_PROGRAMS = profanity
-profanity_SOURCES = src/command.c src/contact.c src/history.c src/jabber.h \
+profanity_SOURCES = src/command.c src/contact.c src/history.c src/xmpp.h \
 	src/preferences.c src/autocomplete.c src/status_bar.c \
 	src/command.h src/contact.h src/history.h src/log.c src/preferences.h \
 	src/autocomplete.h src/title_bar.c src/windows.c src/common.c \
diff --git a/src/command.c b/src/command.c
index 50913c6c..767081af 100644
--- a/src/command.c
+++ b/src/command.c
@@ -35,7 +35,6 @@
 #include "contact_list.h"
 #include "chat_log.h"
 #include "history.h"
-#include "jabber.h"
 #include "jid.h"
 #include "log.h"
 #include "parser.h"
@@ -46,6 +45,7 @@
 #include "theme.h"
 #include "tinyurl.h"
 #include "ui.h"
+#include "xmpp.h"
 
 typedef char*(*autocomplete_func)(char *);
 
diff --git a/src/connection.c b/src/connection.c
index 8185c7c8..a32a3221 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -30,13 +30,13 @@
 #include "chat_session.h"
 #include "common.h"
 #include "contact_list.h"
-#include "jabber.h"
 #include "jid.h"
 #include "log.h"
 #include "preferences.h"
 #include "profanity.h"
 #include "muc.h"
 #include "stanza.h"
+#include "xmpp.h"
 
 static struct _jabber_conn_t {
     xmpp_log_t *log;
diff --git a/src/iq.c b/src/iq.c
index 960dd2c7..43e31147 100644
--- a/src/iq.c
+++ b/src/iq.c
@@ -29,9 +29,9 @@
 #include "common.h"
 #include "config.h"
 #include "contact_list.h"
-#include "jabber.h"
 #include "log.h"
 #include "stanza.h"
+#include "xmpp.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_IQ, type, ctx)
 
diff --git a/src/profanity.c b/src/profanity.c
index e90fd49f..35998adf 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -44,8 +44,8 @@
 #include "profanity.h"
 #include "muc.h"
 #include "theme.h"
-#include "jabber.h"
 #include "ui.h"
+#include "xmpp.h"
 
 static log_level_t _get_log_level(char *log_level);
 static gboolean _process_input(char *inp);
diff --git a/src/profanity.h b/src/profanity.h
index a28bd292..d971f1cc 100644
--- a/src/profanity.h
+++ b/src/profanity.h
@@ -23,7 +23,7 @@
 #ifndef PROFANITY_H
 #define PROFANITY_H
 
-#include "jabber.h"
+#include "xmpp.h"
 
 void prof_run(const int disable_tls, char *log_level);
 
diff --git a/src/ui.h b/src/ui.h
index 2342be3b..4e94b1da 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -36,7 +36,7 @@
 #endif
 
 #include "contact.h"
-#include "jabber.h"
+#include "xmpp.h"
 #include "jid.h"
 
 #define INP_WIN_MAX 1000
diff --git a/src/jabber.h b/src/xmpp.h
similarity index 98%
rename from src/jabber.h
rename to src/xmpp.h
index df75d503..c10291e2 100644
--- a/src/jabber.h
+++ b/src/xmpp.h
@@ -1,5 +1,5 @@
 /*
- * jabber.h
+ * xmpp.h
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef JABBER_H
-#define JABBER_H
+#ifndef XMPP_H
+#define XMPP_H
 
 #include <strophe.h>