diff --git a/.gitignore b/.gitignore
index a8b8644..e6778eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ emf-2.6.1.tar.gz
 /emf-2.8.0
 /noarch
 emf-2.8.0.tar.gz
+/emf-2.8.1.tar.gz
diff --git a/eclipse-emf.spec b/eclipse-emf.spec
index 9065ed9..1e655ac 100644
--- a/eclipse-emf.spec
+++ b/eclipse-emf.spec
@@ -6,8 +6,8 @@
 %define __find_requires %{nil} 
 
 Name:      eclipse-emf
-Version:   2.8.0
-Release:   17%{?dist}
+Version:   2.8.1
+Release:   1%{?dist}
 Summary:   Eclipse Modeling Framework (EMF) Eclipse plugin
 Group:     System Environment/Libraries
 License:   EPL
@@ -152,7 +152,7 @@ fi
 %build
 # Note: We use forceContextQualifier because the docs plugins use custom build
 #       scripts and don't work otherwise.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20110913-1526"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v20120911-0500"
 
 # Work around pdebuild entering/leaving symlink it is unaware of.
 ln -s %{_builddir}/emf-%{version}/org.eclipse.emf.license-feature %{_builddir}/emf-%{version}/org.eclipse.emf.license
@@ -275,6 +275,9 @@ rm -rf %{buildroot}%{eclipse_dropin}/emf-sdk/eclipse/plugins/org.eclipse.emf.eco
 %{eclipse_dropin}/emf-examples
 
 %changelog
+* Mon Oct 1 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:2.8.1-1
+- Update to upstream 2.8.1 release
+
 * Wed Sep 12 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:2.8.0-17
 - Avoid generating automatic OSGi dependencies.
 
diff --git a/get-emf.sh b/get-emf.sh
index 934cc2a..a38231f 100755
--- a/get-emf.sh
+++ b/get-emf.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 #actual tag to checkout
-TAG=R2_8_0
-XSD_TAG=3d72507583ec6210c44e88eafd429a9786483cbb 
+TAG=14eb839f5e2829d072db6e0e023d28e67e585b7e
+XSD_TAG=9533f3f75c2b3e33b767fb653f47c00f8b3b896c 
 #name of the version to put in the source
-VERSION=2.8.0
+VERSION=2.8.1
 
 rm -rf org.eclipse.emf
 rm -rf org.eclipse.xsd
diff --git a/sources b/sources
index 0aa5e79..591da61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13ec92df131fb3519a58d525e7fffe47  emf-2.8.0.tar.gz
+11ce5438270f0a848a3e94d682758e3d  emf-2.8.1.tar.gz