diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 6d35ce03d..e26985dcf 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -42,7 +42,7 @@ Zotero.Integration = new function() {
 		
 		try {
 			// bind to a random port on loopback only
-			serv.init(50001, true, -1);
+			serv.init(Zotero.Prefs.get('integration.port'), true, -1);
 			serv.asyncListen(Zotero.Integration.SocketListener);
 			
 			Zotero.debug("Integration HTTP server listening on 127.0.0.1:"+serv.port);
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index a74eb1d6e..6fa13bc19 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -66,6 +66,7 @@ pref("extensions.zotero.export.citePaperJournalArticleURL", false);
 pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://www.zotero.org/styles/chicago-note');
 
 // Integration settings
+pref("extensions.zotero.integration.port", 50001);
 pref("extensions.zotero.integration.autoRegenerate", -1);	// -1 = ask; 0 = no; 1 = yes
 
 // Annotation settings