diff --git a/pkgs/development/libraries/wvstreams/default.nix b/pkgs/development/libraries/wvstreams/default.nix
new file mode 100644
index 000000000000..28bab0291721
--- /dev/null
+++ b/pkgs/development/libraries/wvstreams/default.nix
@@ -0,0 +1,23 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "wvstreams-4.6.1";
+
+  src = fetchurl {
+    url = http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz;
+    sha256 = "0cvnq3mvh886gmxh0km858aqhx30hpyrfpg1dh6ara9sz3xza0w4";
+  };
+
+  preConfigure = ''
+    find -type f | xargs sed -i 's@/bin/bash@bash@g'
+  '';
+
+  buildInputs = [qt4 dbus zlib openssl readline perl];
+
+  meta = {
+    description = "network programming library in C++";
+    homepage = http://alumnit.ca/wiki/index.php?page=WvStreams;
+    license = "LGPL";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
new file mode 100644
index 000000000000..c93756ffa25f
--- /dev/null
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -0,0 +1,32 @@
+args: with args;
+
+stdenv.mkDerivation {
+
+  name = "usb-modeswitch-1.1.1";
+
+  src = /tmp/marc/usb-modeswitch-1.1.1.tar.bz2;
+    /*
+    fetchurl {
+    url = 
+    sha256 = "0f7da588yvb1d3l3gk5m0hrqlhg8m4gw93aip3dwkmnawz9r0qca";
+  };
+  */
+
+  # make clean: we always build from source. It should be necessary on x86_64 only
+  preConfigure = ''
+    find -type f | xargs sed 's@/bin/rm@rm@g' -i
+    make clean
+    ensureDir $out/{etc,lib/udev,share/man/man1}
+    makeFlags="DESTDIR=$out PREFIX=$out"
+  '';
+
+  buildInputs = [libusb];
+
+  meta = {
+    description = "...";
+    homepage = "TODO";
+    license = "GPLv2";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/wvdial/default.nix b/pkgs/os-specific/linux/wvdial/default.nix
new file mode 100644
index 000000000000..bc88d56ae316
--- /dev/null
+++ b/pkgs/os-specific/linux/wvdial/default.nix
@@ -0,0 +1,26 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "wvdial-1.16";
+
+  src = fetchurl {
+    url = http://wvstreams.googlecode.com/files/wvdial-1.61.tar.gz;
+    sha256 = "0mzcrv8mc60gbdrixc9k8ammbslvjb9x2cs50yf1jq67aabapzsg";
+  };
+
+  buildInputs = [wvstreams pkgconfig];
+
+  preConfigure = ''
+    find -type f | xargs sed -i 's@/bin/bash@bash@g'
+    export makeFlags="prefix=$out"
+    # not sure about this line
+    sed -i 's@/etc/ppp/peers@$out/etc/ppp/peers@' Makefile.in
+  '';
+
+  meta = {
+    description = "dialer automatically recognizing the modem";
+    homepage = http://alumnit.ca/wiki/index.php?page=WvDial;
+    license = "LGPL";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5135e8082c2..c14105c6068c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -524,6 +524,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  usb_modeswitch = import ../development/tools/misc/usb-modeswitch {
+    inherit stdenv fetchurl libusb;
+  };
+
   cloogppl = import ../development/libraries/cloog-ppl {
     inherit fetchurl stdenv ppl;
   };
@@ -5067,6 +5071,10 @@ let
     inherit (xlibs) libXt;
   };
 
+  wvstreams = import ../development/libraries/wvstreams {
+    inherit stdenv fetchurl qt4 dbus zlib openssl readline perl;
+  };
+
   wxGTK = wxGTK28;
 
   wxGTK26 = import ../development/libraries/wxGTK-2.6 {
@@ -7249,6 +7257,10 @@ let
     inherit fetchurl stdenv perl pkgconfig libpcap flex bison;
     inherit (gtkLibs) gtk;
   };
+  
+  wvdial = import ../os-specific/linux/wvdial {
+    inherit stdenv fetchurl wvstreams pkgconfig;
+  };
 
   fbida = builderDefsPackage ../applications/graphics/fbida {
     inherit libjpeg libexif giflib libtiff libpng