diff --git a/example.scm b/example.scm
index 4f66a30..b004ca9 100644
--- a/example.scm
+++ b/example.scm
@@ -30,7 +30,7 @@
 ;;; POSSIBILITY OF SUCH DAMAGE.
 ;;;
 
-(require-extension fastcgi)
+(import fastcgi)
 
 (fcgi-accept-loop
   "/tmp/fastcgi-socket-0"
diff --git a/fastcgi.egg b/fastcgi.egg
new file mode 100644
index 0000000..f1c0a15
--- /dev/null
+++ b/fastcgi.egg
@@ -0,0 +1,11 @@
+;; -+- mode: scheme -+-
+((author "Alex Drummond <a.d.drummond@gmail.com>")
+ (synopsis "Bindings for the FCGX API of libfcgi")
+ (category web)
+ (license "BSD")
+ (dependencies srfi-1 srfi-13)
+ (foreign-dependencies fcgi)
+ (components
+  (extension fastcgi
+             (csc-options "-I/usr/include/fastcgi"
+                          "-L" "-lfcgi"))))
diff --git a/fastcgi.meta b/fastcgi.meta
deleted file mode 100644
index cecf19a..0000000
--- a/fastcgi.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-((egg "fastcgi.egg")
- (synopsis "Bindings for the FCGX API of libfcgi")
- (category web)
- (license "BSD")
- (doc-from-wiki)
- (author "Alex Drummond <a.d.drummond@gmail.com>")
- (files "fastcgi.meta" "fastcgi.scm" "fastcgi.release-info" "example.scm" "fastcgi.setup"))
-
diff --git a/fastcgi.release-info b/fastcgi.release-info
new file mode 100644
index 0000000..6787460
--- /dev/null
+++ b/fastcgi.release-info
@@ -0,0 +1,3 @@
+(repo git "https:///gitea.lyrion.ch/zilti/fastcgi.git")
+(uri targz "https://gitea.lyrion.ch/zilti/fastcgi/archive/{egg-release}.tar.gz")
+(release "1.1.3") 
diff --git a/fastcgi.scm b/fastcgi.scm
index b678f0e..f4126d1 100644
--- a/fastcgi.scm
+++ b/fastcgi.scm
@@ -38,8 +38,14 @@
    fcgi-get-post-data
    *fcgi-slurp-chunk-size*)
 
-(import chicken scheme foreign)
-(use srfi-1 srfi-13)
+  (import scheme
+          (chicken base)
+          (chicken condition)
+          (chicken blob)
+          (chicken foreign)
+          (chicken gc)
+          srfi-1
+          srfi-13)
 
 (foreign-declare "#include <fcgi_config.h>")
 (foreign-declare "#include <fcgiapp.h>")
diff --git a/fastcgi.setup b/fastcgi.setup
deleted file mode 100644
index 7dd1900..0000000
--- a/fastcgi.setup
+++ /dev/null
@@ -1,9 +0,0 @@
-;;;; fastcgi.setup -*- Scheme -*-
-
-(compile -s -O2 fastcgi.scm -j fastcgi -lfcgi)
-(compile -s -O2 fastcgi.import.scm)
-
-(install-extension 'fastcgi '("fastcgi.so" "fastcgi.import.so")
-                            '((documentation "fastcgi.html")
-                              (version "1.1.2")))
-