diff --git a/cmd/pixiecore-gpl/main.go b/cmd/pixiecore-apache2/main.go
similarity index 62%
rename from cmd/pixiecore-gpl/main.go
rename to cmd/pixiecore-apache2/main.go
index cf43563..43e5971 100644
--- a/cmd/pixiecore-gpl/main.go
+++ b/cmd/pixiecore-apache2/main.go
@@ -14,19 +14,8 @@
 
 package main
 
-import (
-	"go.universe.tf/netboot/pixiecore"
-	"go.universe.tf/netboot/third_party/ipxe"
-)
+import "go.universe.tf/netboot/pixiecore"
 
 func main() {
-	pxe := ipxe.MustAsset("undionly.kpxe")
-	efi32 := ipxe.MustAsset("ipxe-i386.efi")
-	efi64 := ipxe.MustAsset("ipxe-x86_64.efi")
-
-	pixiecore.CLI(map[pixiecore.Firmware][]byte{
-		pixiecore.FirmwareX86PC: pxe,
-		pixiecore.FirmwareEFI32: efi32,
-		pixiecore.FirmwareEFI64: efi64,
-	})
+	pixiecore.CLI(nil)
 }
diff --git a/cmd/pixiecore-gpl/LICENSE b/cmd/pixiecore/LICENSE
similarity index 100%
rename from cmd/pixiecore-gpl/LICENSE
rename to cmd/pixiecore/LICENSE
diff --git a/cmd/pixiecore-gpl/README.md b/cmd/pixiecore/README.md
similarity index 70%
rename from cmd/pixiecore-gpl/README.md
rename to cmd/pixiecore/README.md
index 43aeebb..d79547b 100644
--- a/cmd/pixiecore-gpl/README.md
+++ b/cmd/pixiecore/README.md
@@ -8,6 +8,6 @@ Due to iPXE's license, the result of embedding iPXE builds in the
 Pixiecore binary makes the overall binary fall under the terms of the
 GPLv2. See the LICENSE file in this directory for that license.
 
-If you want an Apache-licensed build, check the "pixiecore" directory
-one level up for a build that doesn't embed iPXE (you have to supply
-iPXE binaries at runtime).
+If you want an Apache-licensed build, check the "pixiecore-apache2"
+directory one level up for a build that doesn't embed iPXE (you have
+to supply iPXE binaries at runtime).
diff --git a/cmd/pixiecore/main.go b/cmd/pixiecore/main.go
index 43e5971..cf43563 100644
--- a/cmd/pixiecore/main.go
+++ b/cmd/pixiecore/main.go
@@ -14,8 +14,19 @@
 
 package main
 
-import "go.universe.tf/netboot/pixiecore"
+import (
+	"go.universe.tf/netboot/pixiecore"
+	"go.universe.tf/netboot/third_party/ipxe"
+)
 
 func main() {
-	pixiecore.CLI(nil)
+	pxe := ipxe.MustAsset("undionly.kpxe")
+	efi32 := ipxe.MustAsset("ipxe-i386.efi")
+	efi64 := ipxe.MustAsset("ipxe-x86_64.efi")
+
+	pixiecore.CLI(map[pixiecore.Firmware][]byte{
+		pixiecore.FirmwareX86PC: pxe,
+		pixiecore.FirmwareEFI32: efi32,
+		pixiecore.FirmwareEFI64: efi64,
+	})
 }