diff --git a/Makefile b/Makefile
index 0185418..f5658cb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,5 @@
 # Licensed under the Eiffel Forum License 2.
 
 archive: ;
-	hg archive -t tbz2 phenny.tar.bz2
+	hg archive -t tbz2 phenny-hg.tar.bz2
+	git archive --format=tar --prefix=phenny/ HEAD | bzip2 > phenny.tar.bz2
diff --git a/opt/swhack.py b/opt/swhack.py
deleted file mode 100755
index 9183911..0000000
--- a/opt/swhack.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-"""
-swhack.py - Phenny Swhack Module
-Copyright 2008, Sean B. Palmer, inamidst.com
-Licensed under the Eiffel Forum License 2.
-
-http://inamidst.com/phenny/
-"""
-
-import urllib
-
-def swhack(phenny, input): 
-   if not input.sender in ('#swhack', '#inamidst'): 
-      return
-
-   query = input.group(2)
-   pattern = urllib.quote(query, safe='./')
-
-   u = urllib.urlopen('http://swhack.com/scripts/tail/' + pattern)
-
-   i = None
-   for i, line in enumerate(u.readlines()): 
-      line = line.rstrip('\r\n')
-      if i == 0: 
-         phenny.reply(line)
-      else: phenny.say('[off] ' + line)
-   if i is None: 
-      phenny.reply('Sorry, no results found.')
-
-   u.close()
-# swhack.commands = ['swhack']
-
-if __name__ == '__main__': 
-   print __doc__.strip()