diff --git a/VirtualBox-4.1.16-patched.tar.bz2 b/VirtualBox-4.1.16-patched.tar.bz2
deleted file mode 100644
index 5766504..0000000
--- a/VirtualBox-4.1.16-patched.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:686f94edbdc03bc67763914d0d82793a7fc09eee67b8b6f7266f3f4266dafc6c
-size 46315678
diff --git a/VirtualBox-4.1.18-patched.tar.bz2 b/VirtualBox-4.1.18-patched.tar.bz2
new file mode 100644
index 0000000..a2c405d
--- /dev/null
+++ b/VirtualBox-4.1.18-patched.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65fa3472cd21dd5fcbf766f3eb7fcf2f77aaafd6a4e768df749270d3b6af4d0c
+size 46432363
diff --git a/virtualbox-4.1.16-UserManual.pdf b/virtualbox-4.1.16-UserManual.pdf
deleted file mode 100644
index f315085..0000000
--- a/virtualbox-4.1.16-UserManual.pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b11674f0861116b8faac28839652fcdf205a88a14ab4d986bd36d56c8bd4e9b
-size 5080770
diff --git a/virtualbox-4.1.18-UserManual.pdf b/virtualbox-4.1.18-UserManual.pdf
new file mode 100644
index 0000000..ff2a354
--- /dev/null
+++ b/virtualbox-4.1.18-UserManual.pdf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ec156c9e8773e581ecfa5161c8351c1e11adefe0c10d7df4a5e39e43d8cbbef
+size 5082221
diff --git a/virtualbox-4.1.16-rpmlintrc b/virtualbox-4.1.18-rpmlintrc
similarity index 100%
rename from virtualbox-4.1.16-rpmlintrc
rename to virtualbox-4.1.18-rpmlintrc
diff --git a/virtualbox.changes b/virtualbox.changes
index b32c5e9..c4a550e 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz
+
+- let it build with all versions of openjkd
+
+-------------------------------------------------------------------
+Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com
+
+- update to virtualbox 4.1.18 (This is a maintenance release) 
+* VMM: fixed VERR_REM_VIRTUAL_CPU_ERROR under rare conditions after the guest has been reset (bug #5164 and others)
+* VMM: fixed host freezes with 64-bit guests on 32-bit Linux hosts (bug #10528)
+* VRDP: added a workaround for rdesktop clients not properly updating the screen size when minimized
+* AHCI: fixed a rare bug which can cause a guest memory corruption after the guest storage controler has been reset
+* NAT: another attempt to fix crashes under rare conditions (Windows hosts only; bug #10513)
+* Mac OS X hosts: addressed issues running Leopard / Snow Leopard (bug #10631)
+* Linux hosts / Bridged Networking: fixed the problem with device driver unloading on kernels 3.2.18 and newer due to an invalid reference counter (bug #10624)
+* Linux hosts / guests: Linux 3.5-rc1 fixes
+* Linux Additions: the guest content was sometimes not properly updated (bug #9887)
+* Solaris Additions: installer fix for X.org Server 1.11 and 1.12
+
 -------------------------------------------------------------------
 Fri Jun  1 20:00:15 UTC 2012 - mseben@gmail.com
 
diff --git a/virtualbox.spec b/virtualbox.spec
index f6eeebb..557957f 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -34,7 +34,7 @@ BuildRequires:  glibc-devel-static
 %endif
 #gsoap,libopenssl and java needed for building webservice
 BuildRequires:  gsoap-devel
-BuildRequires:  java-1_6_0-openjdk-devel
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  libgsoap-devel
 BuildRequires:  libopenssl-devel
 #
@@ -80,7 +80,7 @@ BuildRequires:  xorg-x11-libXt-devel-32bit
 %endif
 #
 ExclusiveArch:  %ix86 x86_64
-Version:        4.1.16
+Version:        4.1.18
 Release:        0
 Summary:        VirtualBox is an Emulator
 License:        GPL-2.0+
@@ -297,7 +297,7 @@ source env.sh
 #  	VBOX_PATH_PACKAGE_DOCS set propper path for link to pdf in .desktop file
 # 	VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= just disable some functionality in gui
 echo "build basic parts"
-/usr/bin/kmk %{?_smp_mfalgs} VBOX_JAVA_HOME=/usr/%{_lib}/jvm/java-1.6.0-openjdk-1.6.0/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all
+/usr/bin/kmk %{?_smp_mfalgs} VBOX_JAVA_HOME=/etc/alternatives/java_sdk_openjdk/ VBOX_GCC_WERR= KBUILD_VERBOSE=2 VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= TOOL_YASM_AS=yasm VBOX_PATH_PACKAGE_DOCS=/usr/share/doc/packages/virtualbox all
 #
 # build kernel modules for guest and host (check novel-kmp package as example)
 # host  modules : vboxdrv,vboxnetflt,vboxnetadp