diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 6d5da98..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-util-vserver-*.tar.bz2*
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b72e46f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+util-vserver-0.30.215.tar.bz2
+util-vserver-0.30.215.tar.bz2.asc
diff --git a/Makefile b/Makefile
deleted file mode 100644
index ca269bd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: util-vserver
-# $Id$
-NAME := util-vserver
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/lastver b/lastver
index c9fd43c..1790a0f 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.30.214
+0.30.215
diff --git a/sources b/sources
index b7bc5b6..c40bfbf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
-ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc
+befd9b8e5311e87395b67ee381d83649  util-vserver-0.30.215.tar.bz2
+783de8acf8f16e56c1b8cf4a7b683994  util-vserver-0.30.215.tar.bz2.asc
diff --git a/util-vserver-0.30.214-stat.patch b/util-vserver-0.30.214-stat.patch
deleted file mode 100644
index c33ef4c..0000000
--- a/util-vserver-0.30.214-stat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: lib_internal/util-safechdir.h
-===================================================================
---- lib_internal/util-safechdir.h	(revision 2605)
-+++ lib_internal/util-safechdir.h	(working copy)
-@@ -19,7 +19,8 @@
- #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
- #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
- 
--struct stat;
-+#include <sys/stat.h>
-+
- int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
- 
- #define EsafeChdir(PATH,EXP_STAT) \
diff --git a/util-vserver.spec b/util-vserver.spec
index afa7fff..756cc61 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,5 +1,3 @@
-# $Id$
-
 ## This package understands the following switches:
 ## --without dietlibc        ...   disable usage of dietlibc
 ## --with    xalan           ...   require/use the xalan xslt processor
@@ -28,14 +26,13 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.214
-Release:	%release_func 2
+Version:	0.30.215
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
 Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.214-stat.patch
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
@@ -176,11 +173,11 @@ develop VServer related applications.
 
 %prep
 %setup -q
-%patch0 -p0 -b .stat
 
 
 %build
 %configure --with-initrddir=%_initrddir --enable-release \
+	   --with-crypto-api=beecrypt \
 	   %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc
 
 %__make %{?_smp_mflags} all
@@ -200,6 +197,7 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 
 %check || :
 %__make check
+LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || :
 
 
 %clean
@@ -365,6 +363,11 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %changelog
+* Sat Apr 12 2008 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.215-1
+- updated to 0.30.215
+- enforced beecrypt crypto api
+- run crypto-suite benchmark in %%check
+
 * Wed Sep 19 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.214-2
 - fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when
   a directory becomes a symlink. Hence, remove the 'etch' directory in