diff --git a/Formula/colloquypush.rb b/Formula/colloquypush.rb
new file mode 100644
index 00000000000..7cc11cff425
--- /dev/null
+++ b/Formula/colloquypush.rb
@@ -0,0 +1,14 @@
+require 'formula'
+
+class Colloquypush <Formula
+  head 'git://github.com/wired/colloquypush.git'
+  homepage 'http://github.com/wired/colloquypush'
+
+  depends_on 'znc'
+
+  def install
+    Dir.chdir("znc")
+    system "znc-buildmod", "colloquy.cpp"
+    system "install", "-m", "0755", "colloquy.so", %x[znc-config --moddir].strip()
+  end
+end
diff --git a/Formula/znc.rb b/Formula/znc.rb
index 9a94bd81a1c..04bfc11c368 100644
--- a/Formula/znc.rb
+++ b/Formula/znc.rb
@@ -1,20 +1,17 @@
 require 'formula'
 
 class Znc <Formula
-  url 'http://downloads.sourceforge.net/project/znc/znc/0.076/znc-0.076.tar.gz'
+  head 'https://znc.svn.sourceforge.net/svnroot/znc/trunk'
   homepage 'http://en.znc.in/wiki/ZNC'
-  md5 '03c2804b91225e83884f06078f6db568'
-
+  
   depends_on 'c-ares'
   depends_on 'pkg-config' => :optional
-
+  
   skip_clean 'bin/znc'
-
+  skip_clean 'bin/znc-config'
+  skip_clean 'bin/znc-buildmod'
+  
   def install
-    # This is a 3rd-party module that handles push notifications for Colloquy on the iPhone
-    # it's off by default, but annoying to compile if you don't do it while the source is available
-    system "curl -Ls -o modules/colloquy.cpp http://github.com/wired/colloquypush/raw/e678ca8ba9b3515dc8bfabeb7a6f258e6b8665e8/znc/colloquy.cpp"
-
     # Apparently Snow Leopard's libperl is at /System/Library/Perl/lib/5.10/libperl.dylib
     # but I don't know how to tell znc that. Perl is only used for user plugins, anyway.
     system "./configure", "--prefix=#{prefix}", "--enable-extra", "--disable-perl"