diff --git a/varnish/varnish.patch b/varnish/varnish.patch
index b89cdeeb2c..3236f117b1 100644
--- a/varnish/varnish.patch
+++ b/varnish/varnish.patch
@@ -1,21 +1,21 @@
 Index: bin/varnishd/common.h
---- bin/varnishd/common.h.orig	2007-08-20 22:05:40 +0200
-+++ bin/varnishd/common.h	2007-10-06 10:39:12 +0200
-@@ -44,3 +44,8 @@
- void TCP_name(struct sockaddr *addr, unsigned l, char *abuf, unsigned alen, char *pbuf, unsigned plen);
- void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
- int TCP_filter_http(int sock);
+--- bin/varnishd/common.h.orig	2008-09-24 20:05:20 +0200
++++ bin/varnishd/common.h	2008-09-25 09:14:05 +0200
+@@ -52,3 +52,8 @@
+ 		fprintf(stderr, "Error: " __VA_ARGS__);		\
+ 		exit(2);					\
+ 	} while (0);
 +
 +#ifndef NAN
 +#define NAN (__builtin_nanf(""))
 +#endif
 +
 Index: bin/varnishd/mgt_child.c
---- bin/varnishd/mgt_child.c.orig	2007-08-20 22:05:40 +0200
-+++ bin/varnishd/mgt_child.c	2007-10-06 10:39:12 +0200
-@@ -217,6 +217,21 @@
- 
- 	fprintf(stderr, "start child pid %jd\n", (intmax_t)pid);
+--- bin/varnishd/mgt_child.c.orig	2008-09-24 20:05:20 +0200
++++ bin/varnishd/mgt_child.c	2008-09-25 09:14:05 +0200
+@@ -239,6 +239,21 @@
+ 	struct vev *e;
+ 	int i, cp[2];
  
 +#ifdef OPKG_PIDFILE
 +	{
@@ -32,18 +32,19 @@ Index: bin/varnishd/mgt_child.c
 +	}
 +#endif
 +
- 	AZ(close(child_fds[1]));
- 	child_fds[1] = -1;
+ 	if (child_state != CH_STOPPED && child_state != CH_DIED)
+ 		return;
  
-Index: bin/varnishd/mgt_vcc.c
---- bin/varnishd/mgt_vcc.c.orig	2007-08-20 22:05:39 +0200
-+++ bin/varnishd/mgt_vcc.c	2007-10-06 10:39:12 +0200
-@@ -184,7 +184,7 @@
- #ifdef __APPLE__
- 	    "exec cc -dynamiclib -Wl,-flat_namespace,-undefined,suppress -o %s -x c - < %s 2>&1",
- #else
--	    "exec cc -fpic -shared -Wl,-x -o %s -x c - < %s 2>&1",
-+	    "exec @l_cc@ -fpic -shared -Wl,-x -o %s -x c - < %s 2>&1",
- #endif
- 	    sf, of, sf);
- 	xxxassert(len < sizeof buf);
+Index: configure
+--- configure.orig	2008-09-24 20:36:08 +0200
++++ configure	2008-09-25 09:16:28 +0200
+@@ -26605,9 +26605,6 @@
+ # to figure this out dynamically without introducing a run-time
+ # dependency on libtool.
+ case $host in
+-*-*-solaris*)
+-	VCC_CC="cc -Kpic ${CFLAGS} -G -o %o %s"
+-	;;
+ *-*-darwin*)
+ 	VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s"
+ 	;;
diff --git a/varnish/varnish.spec b/varnish/varnish.spec
index 4495b311b9..4f4e71922e 100644
--- a/varnish/varnish.spec
+++ b/varnish/varnish.spec
@@ -21,6 +21,10 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_opkg 2.0b2
+%define       V_dist 2.0-beta2
+
 #   package information
 Name:         varnish
 Summary:      High-Performance HTTP Accelerator
@@ -31,11 +35,11 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Web
 License:      BSD
-Version:      1.1.2
-Release:      20080101
+Version:      %{V_opkg}
+Release:      20080925
 
 #   list of sources
-Source0:      http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
+Source0:      http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{V_dist}.tar.gz
 Source1:      rc.varnish
 Source2:      varnish.vcl
 Patch0:       varnish.patch
@@ -64,7 +68,7 @@ AutoReqProv:  no
 
 %track
     prog varnish = {
-        version   = %{version}
+        version   = %{V_dist}
         url       = http://prdownloads.sourceforge.net/varnish/
         regex     = varnish-(__VER__)\.tar\.gz
     }
@@ -84,14 +88,14 @@ AutoReqProv:  no
     esac
 
     #   unpack and patch Varnish distribution
-    %setup -q
+    %setup -q -n varnish-%{V_dist}
     %patch -p0
 
 %build
     #   ensure OpenPKG %{l_cc} is being used for VCL code generation
     %{l_shtool} subst \
-        -e 's;@l_cc@;%{l_cc};g' \
-        bin/varnishd/mgt_vcc.c
+        -e 's;exec cc;exec %{l_cc};g' \
+        configure
 
     #   configure package
     export CC="%{l_cc}"