diff --git a/.gitignore b/.gitignore
index fe95b08..96fc48f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@ templates/boot/grub/grub.cfg
 templates/boot/isolinux/isolinux.cfg
 templates/boot/isolinux/syslinux.cfg
 templates/scripts/includes/netscript/
-templates/scripts/includes/sipwise.gpg
diff --git a/Makefile b/Makefile
index a746d82..0ee88ac 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,6 @@ build:
 	--no-parent --no-host-directories --cut-dirs=1 "http://deb.sipwise.com/netscript/${RELEASE}/" ; \
 	echo " done.";
 
-	@echo -n "Downloading Sipwise keyring 'sipwise.gpg'"; \
-	wget -O ./templates/scripts/includes/sipwise.gpg https://deb.sipwise.com/spce/sipwise.gpg ;\
-	echo " done.";
-
 syntaxcheck: shellcheck
 
 shellcheck:
@@ -29,7 +25,6 @@ shellcheck:
 clean:
 	rm -f templates/boot/isolinux/syslinux.cfg
 	rm -rf templates/scripts/includes/netscript
-	rm -f templates/scripts/includes/sipwise.gpg
 	rm -f templates/boot/grub/grub.cfg
 	rm -f templates/boot/isolinux/isolinux.cfg
 
diff --git a/templates/scripts/keys/sipwise.gpg b/templates/scripts/keys/sipwise.gpg
new file mode 100644
index 0000000..71d1f23
Binary files /dev/null and b/templates/scripts/keys/sipwise.gpg differ
diff --git a/templates/scripts/main.sh b/templates/scripts/main.sh
index 5864211..0fdb5b9 100755
--- a/templates/scripts/main.sh
+++ b/templates/scripts/main.sh
@@ -7,6 +7,7 @@ export LC_ALL=C
 
 working_dir="$(dirname "$0")"
 scripts_dir="${working_dir}/includes/"
+keys_dir="${working_dir}/keys/"
 netscript_dir="${scripts_dir}/netscript/"
 
 RC=0
@@ -20,11 +21,11 @@ einfo "Executing grml-sipwise specific checks..."
 eindent
 
 install_sipwise_keyring() {
-  if [ -f "${scripts_dir}/sipwise.gpg" ]; then
+  if [ -f "${keys_dir}/sipwise.gpg" ]; then
     einfo "Installing sipwise keyring to '/etc/apt/trusted.gpg.d/sipwise.gpg'..."; eend 0
-    cp "${scripts_dir}/sipwise.gpg" /etc/apt/trusted.gpg.d/sipwise.gpg
+    cp "${keys_dir}/sipwise.gpg" /etc/apt/trusted.gpg.d/sipwise.gpg
   else
-    ewarn "Sipwise keyring '${scripts_dir}/sipwise.gpg' not found, continuing anyway." ; eend 0
+    ewarn "Sipwise keyring '${keys_dir}/sipwise.gpg' not found, continuing anyway." ; eend 0
   fi
 }