diff --git a/beehive-jms-control/pom.xml b/beehive-jms-control/pom.xml
index b8badcb..6ec24c4 100644
--- a/beehive-jms-control/pom.xml
+++ b/beehive-jms-control/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>beehive-jms-control</artifactId>
     <name>beehive-jms-control</name>
     <properties>
-        <gensrc.dir>${project.build.directory}/generated-sources</gensrc.dir>
+        <gensrc.dir>${project.build.outputDirectory}</gensrc.dir>
     </properties>
     <dependencies>
         <dependency>
@@ -46,14 +46,6 @@
         </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>${gensrc.dir}</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index f28113b..562ce4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,6 +205,10 @@
             <resource>
                 <directory>src/main/resources</directory>
             </resource>
+            <resource>
+                <!-- For generated sources, ugly hack, but maven-source-plugin can't do it any other way right now? -->
+                <directory>${project.build.outputDirectory}</directory>
+            </resource>
             <resource>
                 <directory>../</directory>
                 <includes>
@@ -234,6 +238,25 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+                <executions>
+                <execution>
+                    <id>attach-sources</id>
+                    <phase>verify</phase>
+                    <goals>
+                        <goal>jar-no-fork</goal>
+                    </goals>
+                </execution>
+                </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>