diff --git a/plugin/gnupg.vim b/plugin/gnupg.vim
index 6fa605a..02e6e25 100644
--- a/plugin/gnupg.vim
+++ b/plugin/gnupg.vim
@@ -335,7 +335,7 @@ endf
 "
 fun s:GPGEditRecipients()
   " only do this if it isn't already a GPGRecipients_* buffer
-  if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.gpg$") >= 0)
+  if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|pgp\\)$") >= 0)
 
     " save buffer name
     let buffername=bufname("%")
@@ -502,7 +502,7 @@ endf
 "
 fun s:GPGEditOptions()
   " only do this if it isn't already a GPGOptions_* buffer
-  if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.gpg$") >= 0)
+  if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|pgp\\)$") >= 0)
 
     " save buffer name
     let buffername=bufname("%")