diff --git a/.gitignore b/.gitignore
index a40962f..8b2baed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /4.0.2.tar.gz
 /4.0.3.tar.gz
 /4.0.4.tar.gz
+/4.0.5.tar.gz
diff --git a/byteman.spec b/byteman.spec
index 1a865ec..2ac8281 100644
--- a/byteman.spec
+++ b/byteman.spec
@@ -14,18 +14,18 @@
 %global bindir %{homedir}/bin
 
 Name:             byteman
-Version:          4.0.4
-Release:          2%{?dist}
+Version:          4.0.5
+Release:          1%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
-# wget -O 4.0.4.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.4.tar.gz
+# wget -O 4.0.5.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.5.tar.gz
 Source0:          https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz
 
 BuildArch:        noarch
 
 # Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly.
-BuildRequires:    java-10-openjdk-devel
+BuildRequires:    java-11-openjdk-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-shade-plugin
 BuildRequires:    maven-source-plugin
@@ -47,7 +47,7 @@ BuildRequires:    testng
 # JBoss modules byteman plugin requires it
 BuildRequires:    mvn(org.jboss.modules:jboss-modules)
 
-Provides:         bundled(objectweb-asm) = 6.2
+Provides:         bundled(objectweb-asm) = 7.0
 Provides:         bundled(java_cup) = 1:0.11b-8
 # We are filtering java-headless >= 1:1.9 requirement. Add
 # JDK 8 requirement here explicitly which shouldn't match the filter.
@@ -138,7 +138,7 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %mvn_package ":byteman-dtest" dtest
 
 %build
-export JAVA_HOME=/usr/lib/jvm/java-10-openjdk
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 %mvn_build
 
 %install
@@ -206,6 +206,9 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %{homedir}/lib/byteman-dtest.jar
 
 %changelog
+* Wed Nov 21 2018 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.5-1
+- Update to latest upstream 4.0.5 release.
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 812b9a2..a32d102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (4.0.4.tar.gz) = 1d6b45dfa535a6c2a4615db679c1dcc51cfd84923ac2c1ba97716572af2baece0b39119aff7b3266e9d1838dc8b47f678b7efc5bbaf9500329728e982dd7774c
+SHA512 (4.0.5.tar.gz) = 2a9bd3d19ccfe2208c791422fc7bb89c2c322779c5ce4b917b50a9ec131ed23ca78f374e6e3c457774a06934446019a92ad4aea6402757ab6a82e8d6dd3afae7