diff --git a/CHANGES b/CHANGES
index 75107d2496..1c23429a43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
 
+2.1-675 | 2013-06-02 20:03:19 -0700
+
+  * Fix a compiler warning. (Robin Sommer)
+
+  * Allow named vector/set/table/record constructors. Addresses #983.
+    (Jon Siwek)
+
+  * Adding Makefile target test-all that also runs the BroControl test
+    suite.  (Robin Sommer)
+
 2.1-664 | 2013-05-28 21:37:46 -0700
 
   * Dangling pointer fix. Addresses #1004. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 688d60ec69..f3667fe959 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-664
+2.1-675
diff --git a/src/RemoteSerializer.cc b/src/RemoteSerializer.cc
index 66f8def489..8cd34aa8fc 100644
--- a/src/RemoteSerializer.cc
+++ b/src/RemoteSerializer.cc
@@ -351,10 +351,12 @@ public:
 		}
 
 	char Type()	{ return buffer[0]; }
+
 	RemoteSerializer::PeerID Peer()
 		{
-		// Wow, is this ugly...
-		return ntohl(*(uint32*)(buffer + 4));
+		uint32 tmp;
+		memcpy(&tmp, buffer + 4, sizeof(tmp));
+		return ntohl(tmp);
 		}
 
 	const char* Raw()	{ return buffer; }