diff --git a/cadaver/cadaver.spec b/cadaver/cadaver.spec
index f21bb206e5..6f52a6be59 100644
--- a/cadaver/cadaver.spec
+++ b/cadaver/cadaver.spec
@@ -23,19 +23,17 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME mlelstv - JUNK because of neon API changes
-
 #   package information
 Name:         cadaver
 Summary:      Command-Line WebDAV client
 URL:          http://www.webdav.org/cadaver/
 Vendor:       Joe Orton
 Packager:     The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      GPL
 Version:      0.21.0
-Release:      20030628
+Release:      20030701
 
 #   list of sources
 Source0:      http://www.webdav.org/cadaver/cadaver-%{version}.tar.gz
@@ -44,9 +42,9 @@ Source0:      http://www.webdav.org/cadaver/cadaver-%{version}.tar.gz
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20021230
-BuildPreReq:  ncurses, libxml, neon, zlib, openssl, libiconv, readline
+BuildPreReq:  ncurses, libxml, zlib, openssl, libiconv, readline, getopt
 PreReq:       OpenPKG, openpkg >= 20021230
-PreReq:       ncurses, libxml, neon, zlib, openssl, libiconv, readline
+PreReq:       ncurses, libxml, zlib, openssl, libiconv, readline, getopt
 AutoReq:      no
 AutoReqProv:  no
 
@@ -60,15 +58,17 @@ AutoReqProv:  no
     %setup -q
 
 %build
+    echo 'ac_cv_func_getopt_long=yes' >config.cache
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
-    CPPFLAGS="-I%{l_prefix}/include" \
-    LDFLAGS="-L%{l_prefix}/lib" \
+    CPPFLAGS="%{l_cppflags}" \
+    LDFLAGS="%{l_ldflags}" \
+    LIBS="-lgetopt" \
     XML2_CONFIG="%{l_prefix}/bin/xml2-config" \
     ./configure \
+        --cache-file=./config.cache \
         --prefix=%{l_prefix} \
-        --without-included-neon \
-        --with-neon=%{l_prefix} \
+        --with-included-neon \
         --with-ssl=%{l_prefix}
     %{l_shtool} subst -e 's;lib/getopt1;lib/getopt1.o lib/getopt;' Makefile
     %{l_make} %{l_mflags -O}