diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6b1efd7bc03d..90732cf75f88 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.0a";
+  name = "openssl-1.0.0b";
 
   src = fetchurl {
     url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q";
+    sha256 = "0cbk04cwmbf7l0bycqx8y04grfsx96mn2d8lbrydkqiyncplwysf";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 6a0eb4020017..293fe43d0653 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vice-2.1";
+  name = "vice-2.2";
   src = fetchurl {
-    url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz;
-    sha256 = "dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66";
+    url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
+    sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
   };
   buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
                   pkgconfig gtk SDL autoconf automake ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c4595dcd21a..b3a39592c78b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -886,6 +886,29 @@ rec {
     };
   };
 
+  magic = buildPythonPackage rec {
+    name = "magic-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/python-magic/python-${name}.tar.gz";
+      md5 = "397cff81d2502e81fd3830a61ca2ad2c";
+    };
+
+    preConfigure =
+      ''
+        # Ensure that the module can find libmagic by hard-coding the
+        # path to libmagic.so.  Maybe there is a nicer way.
+        substituteInPlace magic.py --replace \
+          "ctypes.util.find_library('magic')" \
+          "'${pkgs.file}/lib/libmagic.so'"
+      '';
+
+    meta = {
+      description = "A Python wrapper around libmagic";
+      homepage = https://github.com/ahupp/python-magic;
+    };
+  };
+
   setuptoolsDarcs = buildPythonPackage {
     name = "setuptools-darcs-1.2.9";