diff --git a/history.txt b/history.txt
index a59b64c912..08f537364c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2014-11-04 zzz
+ * SSU: Fix corruption of ack-only packets containing bitfields
+
 * 2014-11-01 0.9.16 released
 
 2014-10-30 kytv
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b00998..87e5bffca0 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
index feb2b42403..64a96dcf04 100644
--- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
+++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java
@@ -434,7 +434,9 @@ class PacketBuilder {
                 off += 4;
                 for (int curByte = 0; curByte < size; curByte++) {
                     if (curByte + 1 < size)
-                        data[off] |= (byte)(1 << 7);
+                        data[off] = (byte)(1 << 7);
+                    else
+                        data[off] = 0;
                     
                     for (int curBit = 0; curBit < 7; curBit++) {
                         if (bitfield.received(curBit + 7*curByte))
@@ -467,7 +469,7 @@ class PacketBuilder {
             DataHelper.toLong(data, off, 4, state.getMessageId());
             off += 4;
         
-            data[off] |= fragment << 1;
+            data[off] = (byte) (fragment << 1);
             if (fragment == state.getFragmentCount() - 1)
                 data[off] |= 1; // isLast
             off++;
@@ -621,8 +623,7 @@ class PacketBuilder {
             off++;
             for (int i = 0; i < ackBitfields.size(); i++) {
                 ACKBitfield bitfield = ackBitfields.get(i);
-                // no, this will corrupt the packet
-                //if (bitfield.receivedComplete()) continue;
+                if (bitfield.receivedComplete()) continue;
                 DataHelper.toLong(data, off, 4, bitfield.getMessageId());
                 off += 4;
                 // only send what we have to
@@ -633,7 +634,9 @@ class PacketBuilder {
                     size++;
                 for (int curByte = 0; curByte < size; curByte++) {
                     if (curByte + 1 < size)
-                        data[off] |= (byte)(1 << 7);
+                        data[off] = (byte)(1 << 7);
+                    else
+                        data[off] = 0;
                     
                     for (int curBit = 0; curBit < 7; curBit++) {
                         if (bitfield.received(curBit + 7*curByte))
@@ -878,7 +881,7 @@ class PacketBuilder {
         }
         
         // now for the body
-        data[off] |= fragmentNum << 4;
+        data[off] = (byte) (fragmentNum << 4);
         data[off] |= (numFragments & 0xF);
         off++;