diff --git a/general/package/wifibroadcast-ng/src/keypair.c b/general/package/wifibroadcast-ng/src/keygen.c
similarity index 77%
rename from general/package/wifibroadcast-ng/src/keypair.c
rename to general/package/wifibroadcast-ng/src/keygen.c
index a4167bce..bac561f8 100644
--- a/general/package/wifibroadcast-ng/src/keypair.c
+++ b/general/package/wifibroadcast-ng/src/keygen.c
@@ -44,9 +44,9 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	const char *key = "/etc/drone.key";
-	if ((fp = fopen(key, "w")) == NULL) {
-		printf("Unable to save: %s\n", key);
+	const char *drone = "/etc/drone.key";
+	if ((fp = fopen(drone, "w")) == NULL) {
+		printf("Unable to save: %s\n", drone);
 		return 1;
 	}
 
@@ -54,7 +54,19 @@ int main(int argc, char **argv) {
 	fwrite(gs_publickey, crypto_box_PUBLICKEYBYTES, 1, fp);
 	fclose(fp);
 
-	printf("Drone keypair saved: %s\n", key);
+	printf("Drone keypair saved: %s\n", drone);
+
+	const char *station = "/tmp/gs.key";
+	if ((fp = fopen(station, "w")) == NULL) {
+		printf("Unable to save: %s\n", station);
+		return 1;
+	}
+
+	fwrite(gs_secretkey, crypto_box_SECRETKEYBYTES, 1, fp);
+	fwrite(drone_publickey, crypto_box_PUBLICKEYBYTES, 1, fp);
+	fclose(fp);
+
+	printf("Station keypair saved: %s\n", station);
 
 	return 0;
 }
diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
index 0ee26fd0..7a0e1404 100644
--- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
+++ b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
@@ -12,7 +12,7 @@ WIFIBROADCAST_NG_DEPENDENCIES += libpcap libsodium
 
 define WIFIBROADCAST_NG_BUILD_CMDS
 	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CXX) LDFLAGS=-s -C $(@D) all_bin
-	$(TARGET_CC) $(WIFIBROADCAST_NG_PKGDIR)/src/keypair.c -o $(@D)/keypair -lsodium -s
+	$(TARGET_CC) $(WIFIBROADCAST_NG_PKGDIR)/src/keygen.c -o $(@D)/keygen -lsodium -s
 endef
 
 define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
@@ -24,7 +24,7 @@ define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(WIFIBROADCAST_NG_PKGDIR)/files/S98wifibroadcast
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/keypair
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/keygen
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx_cmd
diff --git a/general/package/wifibroadcast-ng/www/index.html b/general/package/wifibroadcast-ng/www/index.html
index 9d66f889..b2033343 100644
--- a/general/package/wifibroadcast-ng/www/index.html
+++ b/general/package/wifibroadcast-ng/www/index.html
@@ -135,6 +135,7 @@
       <div class="row">
         <label for="channel">Channel:</label>
         <select id="channel" name="wfb.wireless.channel">
+          <option value="32">32</option>
           <option value="36">36</option>
           <option value="40">40</option>
           <option value="44">44</option>
@@ -143,6 +144,8 @@
           <option value="56">56</option>
           <option value="60">60</option>
           <option value="64">64</option>
+          <option value="68">68</option>
+          <option value="96">96</option>
           <option value="100">100</option>
           <option value="104">104</option>
           <option value="108">108</option>
@@ -160,6 +163,9 @@
           <option value="157">157</option>
           <option value="161">161</option>
           <option value="165">165</option>
+          <option value="169">169</option>
+          <option value="173">173</option>
+          <option value="177">177</option>
         </select>
       </div>
       <div class="row">