diff --git a/Makefile b/Makefile
index 2e952d166..2b288acb9 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,8 @@ cover-viz: cover
 # Compile Pilosa
 build:
 	$(GO) build -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) ./cmd/featurebase
+	$(GO) build -tags='$(BUILD_TAGS)' -ldflags $(LDFLAGS) $(FLAGS) ./cmd/fbsql
+
 
 package:
 	GOOS=$(GOOS) GOARCH=$(GOARCH) FLAGS="-o featurebase" $(MAKE) build
diff --git a/nfpm.yaml b/nfpm.yaml
index 2c0c4d254..b4db53b39 100644
--- a/nfpm.yaml
+++ b/nfpm.yaml
@@ -10,6 +10,8 @@ homepage: "https://molecula.com"
 contents:
   - src: ./featurebase
     dst: /usr/bin/featurebase
+  - src: ./fbsql
+    dst: /usr/bin/fbsql
   - src: ./install/featurebase.conf
     dst: /etc/featurebase/featurebase.conf
     type: config|noreplace
@@ -22,7 +24,7 @@ contents:
   - src: ./install/featurebase.debian.service
     dst: /lib/systemd/system/featurebase.service
     packager: deb
-  - dst: /var/log/molecula  # We use vendor name on log directory in case other molecula components need it.
+  - dst: /var/log/molecula # We use vendor name on log directory in case other molecula components need it.
     type: dir
     file_info:
       mode: 0755