diff --git a/encryption/templates/active b/encryption/templates/active
index 3be3271..aee3d84 100644
--- a/encryption/templates/active
+++ b/encryption/templates/active
@@ -1,4 +1,5 @@
 wpa
+wpa-psk
 wep-hex
 wep-passphrase
 wep-shared
diff --git a/encryption/templates/wpa b/encryption/templates/wpa
index c618bcb..20b36a7 100644
--- a/encryption/templates/wpa
+++ b/encryption/templates/wpa
@@ -1,4 +1,4 @@
-name = WPA 1/2
+name = WPA 1/2 (Passphrase)
 author = Adam Blackburn
 version = 1
 require key *Key
diff --git a/encryption/templates/wpa-psk b/encryption/templates/wpa-psk
new file mode 100644
index 0000000..3685610
--- /dev/null
+++ b/encryption/templates/wpa-psk
@@ -0,0 +1,15 @@
+name = WPA 1/2 (Preshared Key)
+author = Adam Blackburn
+version = 1
+require apsk *Preshared_Key
+-----
+ctrl_interface=/var/run/wpa_supplicant
+network={
+       ssid="$_ESSID"
+       scan_ssid=$_SCAN
+       proto=WPA RSN
+       key_mgmt=WPA-PSK
+       pairwise=CCMP TKIP
+       group=CCMP TKIP
+       psk="$_APSK"
+}