diff --git a/.cvsignore b/.cvsignore
index e69de29..bfde973 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+libproxy-0.2.3.tar.gz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..2fd8fd7
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+libproxy-0_2_3-8_fc10:HEAD:libproxy-0.2.3-8.fc10.src.rpm:1232723319
diff --git a/libproxy-0.2.3-dbus.patch b/libproxy-0.2.3-dbus.patch
new file mode 100644
index 0000000..2b29918
--- /dev/null
+++ b/libproxy-0.2.3-dbus.patch
@@ -0,0 +1,59 @@
+diff -up libproxy-0.2.3/configure.dbus libproxy-0.2.3/configure
+--- libproxy-0.2.3/configure.dbus	2008-07-11 12:13:12.000000000 +0200
++++ libproxy-0.2.3/configure	2008-07-11 12:13:24.000000000 +0200
+@@ -20408,12 +20408,12 @@ if test -n "$NetworkManager_CFLAGS"; the
+     pkg_cv_NetworkManager_CFLAGS="$NetworkManager_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
++  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager" 2>/dev/null`
++  pkg_cv_NetworkManager_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager dbus-1" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20424,12 +20424,12 @@ if test -n "$NetworkManager_LIBS"; then
+     pkg_cv_NetworkManager_LIBS="$NetworkManager_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "NetworkManager") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager dbus-1\"") >&5
++  ($PKG_CONFIG --exists --print-errors "NetworkManager dbus-1") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager" 2>/dev/null`
++  pkg_cv_NetworkManager_LIBS=`$PKG_CONFIG --libs "NetworkManager dbus-1" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20447,9 +20447,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager" 2>&1`
++	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager dbus-1" 2>&1`
+         else
+-	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager" 2>&1`
++	        NetworkManager_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager dbus-1" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$NetworkManager_PKG_ERRORS" >&5
+diff -up libproxy-0.2.3/configure.ac.dbus libproxy-0.2.3/configure.ac
+--- libproxy-0.2.3/configure.ac.dbus	2008-07-11 12:12:43.000000000 +0200
++++ libproxy-0.2.3/configure.ac	2008-07-11 12:12:58.000000000 +0200
+@@ -19,7 +19,7 @@ PKG_CHECK_MODULES(webkit, webkit-1.0, ha
+ PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, 
+ 		[PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes,
+ 		[PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])
+-PKG_CHECK_MODULES(NetworkManager, NetworkManager, 
++PKG_CHECK_MODULES(NetworkManager, NetworkManager dbus-1, 
+ 					have_networkmanager=yes, have_networkmanager=no)
+ 
+ # Environmental Variable
diff --git a/libproxy.spec b/libproxy.spec
new file mode 100644
index 0000000..70e7029
--- /dev/null
+++ b/libproxy.spec
@@ -0,0 +1,226 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%define gecko_version 1.9
+
+Name:           libproxy
+Version:        0.2.3
+Release:        8%{?dist}
+Summary:        A library handling all the details of proxy configuration
+
+Group:          System Environment/Libraries
+License:        LGPLv2+
+URL:            http://code.google.com/p/libproxy/
+Source0:        http://libproxy.googlecode.com/files/libproxy-%{version}.tar.gz
+Patch0:         libproxy-0.2.3-dbus.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel
+#Virtual Provides - We need either mozjs or WebKit
+Requires: %{name}-pac >= %{version}
+#
+Requires: libproxy-python = %{version}-%{release}
+Requires: libproxy-bin = %{version}-%{release}
+
+# gnome
+BuildRequires:  GConf2-devel
+# mozjs
+BuildRequires:  gecko-devel >= %{gecko_version}
+# NetworkManager
+BuildRequires:  NetworkManager-devel
+BuildRequires:  dbus-devel
+# webkit (gtk)
+BuildRequires:  WebKit-gtk-devel
+# kde
+BuildRequires:  libXmu-devel
+BuildRequires:  libX11-devel
+
+
+%description
+libproxy offers the following features:
+
+    * extremely small core footprint (< 35K)
+    * no external dependencies within libproxy core
+      (libproxy plugins may have dependencies)
+    * only 3 functions in the stable external API
+    * dynamic adjustment to changing network topology
+    * a standard way of dealing with proxy settings across all scenarios
+    * a sublime sense of joy and accomplishment 
+
+Non-default rpmbuild options:
+--with webkit:           Enable WebKit-gtk support
+
+
+%package        bin
+Summary:        Binary to test %{name}
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+
+%description    bin
+The %{name}-bin package contains the proxy binary for %{name}
+
+%package        python
+Summary:        Binding for %{name} and python
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    python
+The %{name}-python package contains the python binding for %{name}
+
+%package        gnome
+Summary:        Plugin for %{name} and gnome
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    gnome
+The %{name}-gnome package contains the %{name} plugin for gnome.
+
+%package        kde
+Summary:        Plugin for %{name} and kde
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    kde
+The %{name}-kde package contains the %{name} plugin for kde.
+
+%package        mozjs
+Summary:        Plugin for %{name} and mozjs
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}
+#Tweak this according to the current gecko-libs version
+Requires:       gecko-libs >= %{gecko_version}
+Provides:       %{name}-pac = %{version}-%{release}
+
+%description    mozjs
+The %{name}-mozjs package contains the %{name} plugin for mozjs.
+
+%package        webkit
+Summary:        Plugin for %{name} and webkit
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}
+Provides:       %{name}-pac = %{version}-%{release}
+
+%description    webkit
+The %{name}-webkit package contains the %{name} plugin for
+webkit.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .dbus
+touch -r configure.dbus configure
+touch -r configure.ac.dbus configure.ac
+
+
+%build
+%configure --includedir=%{_includedir}/libproxy --disable-static --with-python
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files 
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README
+%{_libdir}/*.so.*
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/%{version}
+%dir %{_libdir}/%{name}/%{version}/plugins
+%{_libdir}/%{name}/%{version}/plugins/envvar.so
+%{_libdir}/%{name}/%{version}/plugins/file.so
+%{_libdir}/%{name}/%{version}/plugins/networkmanager.so
+
+%files bin
+%defattr(-,root,root,-)
+%{_bindir}/proxy
+
+%files python
+%defattr(-,root,root,-)
+%{python_sitelib}/*
+
+%files gnome
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/plugins/gnome.so
+
+%files kde
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/plugins/kde.so
+
+%files mozjs
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/plugins/mozjs.so
+
+%files webkit
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/%{version}/plugins/webkit.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/libproxy/
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libproxy-1.0.pc
+
+
+%changelog
+* Thu Jan 22 2009 kwizart < kwizart at gmail.com > - 0.2.3-8
+- Merge NetworkManager module into the main libproxy package
+- Main Requires the -python and -bin subpackage 
+ (splitted for multilibs compliance).
+
+* Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.2.3-7
+- Disable Gnome/KDE default support via builtin modules.
+ (it needs to be integrated via Gconf2/neon instead).
+
+* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-6
+- Disable Obsoletes.
+- Requires ev instead of evr for optionnals sub-packages.
+
+* Tue Oct 21 2008 kwizart < kwizart at gmail.com > - 0.2.3-5
+- Use conditionals build.
+
+* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.2.3-4
+- Remove plugin- in the name of the packages
+
+* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-3
+- Move proxy.h to libproxy/proxy.h
+  This will prevent it to be included in the default include path
+- Split main to libs and util and use libproxy to install all
+
+* Mon Aug  4 2008 kwizart < kwizart at gmail.com > - 0.2.3-2
+- Rename binding-python to python
+- Add Requires: gecko-libs >= %%{gecko_version}
+- Fix some descriptions
+- Add plugin-webkit package
+ 
+* Fri Jul 11 2008 kwizart < kwizart at gmail.com > - 0.2.3-1
+- Convert to Fedora spec
+
+* Fri Jun 6 2008 - dominique-rpm@leuenberger.net
+- Updated to version 0.2.3
+* Wed Jun 4 2008 - dominique-rpm@leuenberger.net
+- Extended spec file to build all available plugins
+* Tue Jun 3 2008 - dominique-rpm@leuenberger.net
+- Initial spec file for Version 0.2.2
+
diff --git a/sources b/sources
index e69de29..4a491f6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+86b635e1eb2d665cfbef4c6134fe6604  libproxy-0.2.3.tar.gz