diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackOutputStream.java
index ea6781495..fcf054c9c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackOutputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackOutputStream.java
@@ -67,9 +67,9 @@ public final class PackOutputStream extends OutputStream {
 
 	private long count;
 
-	private byte[] headerBuffer = new byte[32];
+	private final byte[] headerBuffer = new byte[32];
 
-	private byte[] copyBuffer;
+	private final byte[] copyBuffer = new byte[16 << 10];
 
 	private long checkCancelAt;
 
@@ -216,8 +216,6 @@ public final class PackOutputStream extends OutputStream {
 
 	/** @return a temporary buffer writers can use to copy data with. */
 	public byte[] getCopyBuffer() {
-		if (copyBuffer == null)
-			copyBuffer = new byte[16 * 1024];
 		return copyBuffer;
 	}