diff --git a/update/generator/bzip2.go b/update/generator/bzip2.go
index 2f6dcea..96f66a9 100644
--- a/update/generator/bzip2.go
+++ b/update/generator/bzip2.go
@@ -30,7 +30,10 @@ type bzip2Writer struct {
 func NewBzip2Writer(w io.Writer) (io.WriteCloser, error) {
 	zipper, err := exec.LookPath("lbzip2")
 	if err != nil {
-		zipper = "bzip2"
+		zipper, err := exec.LookPath("bzip2")
+	}
+	if err != nil {
+		return nil, "bzip2 not found"
 	}

 	cmd := exec.Command(zipper, "-c")
diff --git a/update/generator/bzip2_test.go b/update/generator/bzip2_test.go
index a452ff6..01254b0 100644
--- a/update/generator/bzip2_test.go
+++ b/update/generator/bzip2_test.go
@@ -32,6 +32,9 @@ func bunzip2(t *testing.T, z []byte) []byte {
 func TestBzip2(t *testing.T) {
 	smallOnes, err := Bzip2(testOnes)
 	if err != nil {
+		if err == "bzip2 not found"
+			t.Skip("skipping test, no bzip2 installed.")
+
 		t.Fatal(err)
 	}