diff --git a/.gitignore b/.gitignore
index 18c5d72..72f4318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /3.2.1.tar.gz
+/3.3.2.tar.gz
+/disruptor-3.3.2.pom
diff --git a/disruptor-3.2.1.pom b/disruptor-3.2.1.pom
deleted file mode 100644
index 00924bb..0000000
--- a/disruptor-3.2.1.pom
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.lmax</groupId>
-  <artifactId>disruptor</artifactId>
-  <version>3.2.1</version>
-  <name>Disruptor Framework</name>
-  <description>Disruptor - Concurrent Programming Framework</description>
-  <url>http://lmax-exchange.github.com/disruptor</url>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>team</id>
-      <name>LMAX Disruptor Development Team</name>
-      <email>lmax-disruptor@googlegroups.com</email>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git@github.com:LMAX-Exchange/disruptor.git</connection>
-    <url>scm:git@github.com:LMAX-Exchange/disruptor.git</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <version>2.5.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <version>2.5.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.5</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/disruptor.spec b/disruptor.spec
index 27cc574..480694c 100644
--- a/disruptor.spec
+++ b/disruptor.spec
@@ -1,14 +1,15 @@
 Name:          disruptor
-Version:       3.2.1
-Release:       3%{?dist}
+Version:       3.3.2
+Release:       1%{?dist}
 Summary:       Concurrent Programming Framework
 License:       ASL 2.0
 URL:           http://lmax-exchange.github.io/disruptor/
 Source0:       https://github.com/LMAX-Exchange/disruptor/archive/%{version}.tar.gz
 Source1:       http://repo1.maven.org/maven2/com/lmax/%{name}/%{version}/%{name}-%{version}.pom
 
-# test deps
+BuildRequires: maven-local
 BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires: mvn(org.jmock:jmock-junit4)
 BuildRequires: mvn(org.jmock:jmock-legacy)
 
@@ -18,10 +19,6 @@ BuildRequires: mvn(org.jmock:jmock-legacy)
 BuildRequires: mvn(com.google.caliper:caliper:0.5-rc1)
 %endif
 
-# NOTE: the project is buildable with gradle by default
-BuildRequires: maven-local
-BuildRequires: maven-plugin-bundle
-
 BuildArch:     noarch
 
 %description
@@ -35,53 +32,40 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q
-
+# Cleanup
 find . -name "*.class" -print -delete
 find . -name "*.jar" -type f -print -delete
 
 cp -p %{SOURCE1} pom.xml
-%pom_xpath_inject "pom:project" "
-<build>
 
-</build>"
-
-%pom_xpath_inject "pom:project/pom:build" '
-<plugins>
-  <plugin>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>maven-bundle-plugin</artifactId>
-    <version>any</version>
-    <extensions>true</extensions>
-    <configuration>
-      <instructions>
-        <Bundle-DocURL>%{url}</Bundle-DocURL>
-        <Bundle-Name>${project.name}</Bundle-Name>
-        <Bundle-Vendor>LMAX Disruptor Development Team</Bundle-Vendor>
-      </instructions>
-    </configuration>
-    <executions>
-      <execution>
-        <id>bundle-manifest</id>
-        <phase>process-classes</phase>
-        <goals>
-          <goal>manifest</goal>
-        </goals>
-      </execution>
-    </executions>
-  </plugin>
-</plugins>'
-%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin . '
+# Add OSGi support
+%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>"
+%pom_add_plugin org.apache.felix:maven-bundle-plugin:2.3.7 . '
+<extensions>true</extensions>
 <configuration>
-  <archive>
-    <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-  </archive>
-</configuration>'
+  <instructions>
+    <Bundle-DocURL>%{url}</Bundle-DocURL>
+    <Bundle-Name>${project.name}</Bundle-Name>
+    <Bundle-Vendor>LMAX Disruptor Development Team</Bundle-Vendor>
+  </instructions>
+</configuration>
+<executions>
+  <execution>
+    <id>bundle-manifest</id>
+    <phase>process-classes</phase>
+    <goals>
+      <goal>manifest</goal>
+    </goals>
+  </execution>
+</executions>'
 
 # fail to compile cause: incompatible hamcrest apis
 rm -r src/test/java/com/lmax/disruptor/RingBufferTest.java \
  src/test/java/com/lmax/disruptor/RingBufferEventMatcher.java
 # Failed to stop thread: Thread[com.lmax.disruptor.BatchEventProcessor@1d057a39,5,main]
 rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
+# Test fails due to incompatible jmock version
+rm -f src/test/java/com/lmax/disruptor/EventPollerTest.java
 
 %mvn_file :%{name} %{name}
 
@@ -100,6 +84,9 @@ rm -r src/test/java/com/lmax/disruptor/dsl/DisruptorTest.java
 %license LICENCE.txt
 
 %changelog
+* Wed Jun  3 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.2-1
+- Update to upstream version 3.3.2
+
 * Sun Feb 01 2015 gil cattaneo <puntogil@libero.it> 3.2.1-3
 - introduce license macro
 
diff --git a/sources b/sources
index 6e4a11f..b8915c3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-ad9f2b4e790a570c453f867892d6cc0d  3.2.1.tar.gz
+19d62995cf09f719987f8287448cd50c  3.3.2.tar.gz
+124366e0513f62b948ba8b364a5c14e5  disruptor-3.3.2.pom