diff --git a/rdesktop/rdesktop.spec b/rdesktop/rdesktop.spec
index 81be988ab2..d2af2f36b9 100644
--- a/rdesktop/rdesktop.spec
+++ b/rdesktop/rdesktop.spec
@@ -23,28 +23,31 @@
 ##  SUCH DAMAGE. 
 ##  
 
+%define       V_major      1.1.0
+%define       V_patch_here 19.8.4
+%define       V_patch_real 19-8-4
+
 #   package information
 Name:         rdesktop
 Summary:      Windows 2000 and Terminal Services RDP client.
-URL:          http://www.rdesktop.org
+URL:          http://www.rdesktop.org/
 Vendor:       Matt Chapman
 Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Terminal
 License:      GPL
-Version:      1.1.0
-Release:      20020305
+Version:      %{V_major}.%{V_patch_here}
+Release:      20020306
 
 #   list of sources
-Source0:      ftp://download.sourceforge.net/pub/sourceforge/rdesktop/rdesktop-%{version}.tar.gz
-Source1:      rdesktop.1
-#Patch0:       http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch19-5-10.bz2
+Source0:      http://prdownloads.sourceforge.net/rdesktop/rdesktop-%{V_major}.tar.gz
+Patch0:       http://bibl4.oru.se/projects/rdesktop/rdesktop-unified-patch%{V_patch_real}.bz2
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc, X11
+PreReq:       OpenPKG, openpkg >= 20020206, X11
 AutoReq:      no
 AutoReqProv:  no
 
@@ -55,26 +58,31 @@ AutoReqProv:  no
     Unlike Citrix ICA, no server extensions are required.
 
 %prep
-    %setup -q
+    %setup -q -n rdesktop-%{V_major}
+    %patch -p2
 
 %build
     CC="%{l_cc}" \
-    CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
-    CPPFLAGS="-I%{l_prefix}/include" \
-    LDFLAGS="-L%{l_prefix}/lib" \
+    CFLAGS="%{l_cflags -O}" \
     ./configure \
         --prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        --with-openssl=%{l_prefix}
-    %{l_make} %{l_mflags -O}
+        --with-openssl=%{l_prefix} \
+        --with-ssl-includes=%{l_prefix}/include/openssl \
+        --with-ssl-libs=%{l_prefix}/lib \
+        --with-gui=xwin \
+        --with-gui-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+        --with-gui-libs=`%{l_prefix}/etc/rc --query x11_libdir`
+    %{l_make} %{l_mflags} all
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install
     %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
         $RPM_BUILD_ROOT%{l_prefix}/man/man1
+    %{l_shtool} install -c -s -m 755 \
+        rdesktop $RPM_BUILD_ROOT%{l_prefix}/bin/
     %{l_shtool} install -c -m 644 \
-        %{SOURCE rdesktop.1} \
-        $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+        rdesktop.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files