diff --git a/Changelog.txt b/Changelog.txt
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,9 @@
+Fri Oct 16 10:18:31 EDT 2009  paul@thev.net
+  * make linux support generic to *nix, and bump version to 0.4.2
+
+Wed Sep 16 14:00:09 EDT 2009  paul@thev.net
+  * change CC option to fit Snow Leopard
+
 Wed Aug 12 20:53:18 EDT 2009  paul@thev.net
   * bugfix for the dynamic flag; bump version to 0.4.1 for release.
 
diff --git a/GLFW.cabal b/GLFW.cabal
--- a/GLFW.cabal
+++ b/GLFW.cabal
@@ -1,5 +1,5 @@
 name:          GLFW
-version:       0.4.1
+version:       0.4.2
 homepage:      http://haskell.org/haskellwiki/GLFW
 maintainer:    Paul H. Liu <paul@thev.net>
 cabal-version: >= 1.6
@@ -60,46 +60,45 @@
       glfw/lib/time.c
       glfw/lib/window.c
 
-    if os(linux)
-      include-dirs: glfw/lib/x11
-      extra-libraries: Xrandr X11
+    if os(darwin)
+      include-dirs: glfw/lib/macosx
+      frameworks:   AGL Carbon OpenGL
+      cc-options:   -msse2
       c-sources:
-        glfw/lib/x11/x11_enable.c
-        glfw/lib/x11/x11_fullscreen.c
-        glfw/lib/x11/x11_glext.c
-        glfw/lib/x11/x11_init.c
-        glfw/lib/x11/x11_joystick.c
-        glfw/lib/x11/x11_keysym2unicode.c
-        glfw/lib/x11/x11_thread.c
-        glfw/lib/x11/x11_time.c
-        glfw/lib/x11/x11_window.c
+        glfw/lib/macosx/macosx_enable.c
+        glfw/lib/macosx/macosx_fullscreen.c
+        glfw/lib/macosx/macosx_glext.c
+        glfw/lib/macosx/macosx_init.c
+        glfw/lib/macosx/macosx_joystick.c
+        glfw/lib/macosx/macosx_thread.c
+        glfw/lib/macosx/macosx_time.c
+        glfw/lib/macosx/macosx_window.c
     else
-      if os(darwin)
-        include-dirs: glfw/lib/macosx
-        frameworks:   AGL Carbon OpenGL
-        cc-options:   -march=apple
+      if os(mingw32)
+        include-dirs:    glfw/lib/win32
+        extra-libraries: opengl32
         c-sources:
-          glfw/lib/macosx/macosx_enable.c
-          glfw/lib/macosx/macosx_fullscreen.c
-          glfw/lib/macosx/macosx_glext.c
-          glfw/lib/macosx/macosx_init.c
-          glfw/lib/macosx/macosx_joystick.c
-          glfw/lib/macosx/macosx_thread.c
-          glfw/lib/macosx/macosx_time.c
-          glfw/lib/macosx/macosx_window.c
+          glfw/lib/win32/win32_enable.c
+          glfw/lib/win32/win32_fullscreen.c
+          glfw/lib/win32/win32_glext.c
+          glfw/lib/win32/win32_init.c
+          glfw/lib/win32/win32_joystick.c
+          glfw/lib/win32/win32_thread.c
+          glfw/lib/win32/win32_time.c
+          glfw/lib/win32/win32_window.c
       else
-        if os(mingw32)
-          include-dirs:    glfw/lib/win32
-          extra-libraries: opengl32
-          c-sources:
-            glfw/lib/win32/win32_enable.c
-            glfw/lib/win32/win32_fullscreen.c
-            glfw/lib/win32/win32_glext.c
-            glfw/lib/win32/win32_init.c
-            glfw/lib/win32/win32_joystick.c
-            glfw/lib/win32/win32_thread.c
-            glfw/lib/win32/win32_time.c
-            glfw/lib/win32/win32_window.c
+        include-dirs: glfw/lib/x11
+        extra-libraries: Xrandr X11
+        c-sources:
+          glfw/lib/x11/x11_enable.c
+          glfw/lib/x11/x11_fullscreen.c
+          glfw/lib/x11/x11_glext.c
+          glfw/lib/x11/x11_init.c
+          glfw/lib/x11/x11_joystick.c
+          glfw/lib/x11/x11_keysym2unicode.c
+          glfw/lib/x11/x11_thread.c
+          glfw/lib/x11/x11_time.c
+          glfw/lib/x11/x11_window.c
 
 source-repository head
   type:     darcs