diff --git a/lib/stomp.rb b/lib/stomp.rb
index 61d81bd..0950ee7 100644
--- a/lib/stomp.rb
+++ b/lib/stomp.rb
@@ -14,8 +14,8 @@ def Connection.open(login = "", passcode = "", host='localhost', port=61613)
 
     # Create a connection, requires a login and passcode.
     # Can accept a host (default is localhost), and port
-    # (default is 61626) to connect to
-    def initialize(login, passcode, host='localhost', port=61626)
+    # (default is 61613) to connect to
+    def initialize(login, passcode, host='localhost', port=61613)
       @transmit_semaphore = Mutex.new
       @read_semaphore = Mutex.new
 
diff --git a/test/test_client.rb b/test/test_client.rb
index bad3486..10b0c67 100644
--- a/test/test_client.rb
+++ b/test/test_client.rb
@@ -5,7 +5,7 @@
 class TestClient < Test::Unit::TestCase
 
   def setup
-    @client = Stomp::Client.new("test", "user", "localhost", 61626)
+    @client = Stomp::Client.new("test", "user", "localhost", 61613)
   end
 
   def teardown
diff --git a/test/test_stomp.rb b/test/test_stomp.rb
index e6282e4..3378195 100644
--- a/test/test_stomp.rb
+++ b/test/test_stomp.rb
@@ -5,7 +5,7 @@
 class TestStomp < Test::Unit::TestCase
 
   def setup
-    @conn = Stomp::Connection.open "test", "user", "localhost", 61626
+    @conn = Stomp::Connection.open "test", "user", "localhost", 61613
   end
 
   def teardown