diff --git a/Shorewall/ipsecvpn b/Shorewall/Contrib/ipsecvpn
similarity index 100%
rename from Shorewall/ipsecvpn
rename to Shorewall/Contrib/ipsecvpn
diff --git a/Shorewall/isusable b/Shorewall/Contrib/isusable
similarity index 100%
rename from Shorewall/isusable
rename to Shorewall/Contrib/isusable
diff --git a/Shorewall/swping b/Shorewall/Contrib/swping
similarity index 100%
rename from Shorewall/swping
rename to Shorewall/Contrib/swping
diff --git a/Shorewall/swping.init b/Shorewall/Contrib/swping.init
similarity index 100%
rename from Shorewall/swping.init
rename to Shorewall/Contrib/swping.init
diff --git a/Shorewall/tunnel b/Shorewall/Contrib/tunnel
similarity index 100%
rename from Shorewall/tunnel
rename to Shorewall/Contrib/tunnel
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index c2d12348d..5f361e049 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -169,7 +169,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man5/*
 %attr(0644,root,root) %{_mandir}/man8/shorewall.8.gz
 
-%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples swping swping.init isusable
+%doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples 
 
 %changelog
 * Sun Mar 01 2009 Tom Eastep tom@shorewall.net