diff --git a/Shorewall/Macros/macro.SNMPTrap b/Shorewall/Macros/macro.SNMPTrap.deprecated
similarity index 100%
rename from Shorewall/Macros/macro.SNMPTrap
rename to Shorewall/Macros/macro.SNMPTrap.deprecated
diff --git a/Shorewall/action.A_Reject b/Shorewall/action.A_Reject.deprecated
similarity index 100%
rename from Shorewall/action.A_Reject
rename to Shorewall/action.A_Reject.deprecated
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 9676a51d3..ed454d303 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -1063,9 +1063,9 @@ fi
 #
 for f in action.* ; do
     case $f in
-	action.A_Reject)
-	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f 0644
-	    echo "Action ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f"
+	*.deprecated)
+	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*} 0644
+	    echo "Action ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*}"
 	    ;;
 	*)
 	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644
@@ -1078,9 +1078,9 @@ cd Macros
 
 for f in macro.* ; do
     case $f in
-	macro.SNMPTrap)
-	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f 0644
-	    echo "Macro ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/$f"
+	*.deprecated)
+	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*} 0644
+	    echo "Macro ${f#*.} file installed as ${DESTDIR}${SHAREDIR}/$PRODUCT/deprecated/${f%.*}"
 	    ;;
 	*)
 	    install_file $f ${DESTDIR}${SHAREDIR}/$PRODUCT/$f 0644