diff --git a/quickfixj-messages/quickfixj-messages-all/pom.xml b/quickfixj-messages/quickfixj-messages-all/pom.xml
index 01216365ac..ee39a81c87 100644
--- a/quickfixj-messages/quickfixj-messages-all/pom.xml
+++ b/quickfixj-messages/quickfixj-messages-all/pom.xml
@@ -26,7 +26,270 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	
+	<properties>
+		<!-- Default values for spec uptodate properties -->
+		<fix40.spec.uptodate>false</fix40.spec.uptodate>
+		<fix41.spec.uptodate>false</fix41.spec.uptodate>
+		<fix42.spec.uptodate>false</fix42.spec.uptodate>
+		<fix43.spec.uptodate>false</fix43.spec.uptodate>
+		<fix44.spec.uptodate>false</fix44.spec.uptodate>
+		<fix50.spec.uptodate>false</fix50.spec.uptodate>
+		<fix50sp1.spec.uptodate>false</fix50sp1.spec.uptodate>
+		<fix50sp2.spec.uptodate>false</fix50sp2.spec.uptodate>
+	</properties>
 	<profiles>
+		<!-- Profiles for conditional code generation based on spec file changes -->
+		<profile>
+			<id>generate-fix40</id>
+			<activation>
+				<property>
+					<name>fix40.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix40</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
+									<packaging>quickfix.fix40</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix41</id>
+			<activation>
+				<property>
+					<name>fix41.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix41</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
+									<packaging>quickfix.fix41</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix42</id>
+			<activation>
+				<property>
+					<name>fix42.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix42</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
+									<packaging>quickfix.fix42</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix43</id>
+			<activation>
+				<property>
+					<name>fix43.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix43</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
+									<packaging>quickfix.fix43</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix44</id>
+			<activation>
+				<property>
+					<name>fix44.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix44</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
+									<packaging>quickfix.fix44</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix50</id>
+			<activation>
+				<property>
+					<name>fix50.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix50</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
+									<packaging>quickfix.fix50</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix50sp1</id>
+			<activation>
+				<property>
+					<name>fix50sp1.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix50sp1</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
+									<packaging>quickfix.fix50sp1</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>generate-fix50sp2</id>
+			<activation>
+				<property>
+					<name>fix50sp2.spec.uptodate</name>
+					<value>false</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.quickfixj</groupId>
+						<artifactId>quickfixj-codegenerator</artifactId>
+						<executions>
+							<execution>
+								<id>fix50sp2</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+								<configuration>
+									<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
+									<packaging>quickfix.fix50sp2</packaging>
+									<fieldPackage>quickfix.field</fieldPackage>
+									<decimal>${generator.decimal}</decimal>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<!-- Original profiles -->
 		<profile>
 			<id>minimal-fix-latest</id>
 			<!-- This profile has a very specialised purpose.
@@ -200,152 +463,262 @@
 			</testResource>
 		</testResources>
 		<plugins>
+			<!-- Check if FIX spec files have changed -->
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
 				<executions>
+					<!-- Check FIX40 spec -->
 					<execution>
-						<id>unpack-repository</id>
+						<id>check-fix40-spec</id>
 						<phase>initialize</phase>
 						<goals>
-							<goal>unpack</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.quickfixj</groupId>
-									<artifactId>quickfixj-orchestration</artifactId>
-									<version>${project.version}</version>
-									<includes>**/FIX*.xml,**/Orchestra*.xml</includes>
-									<outputDirectory>${project.build.directory}/dependency/repository</outputDirectory>
-								</artifactItem>
-							</artifactItems>
+							<name>fix40.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix40/src/main/resources</directory>
+								<includes>
+									<include>FIX40.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix40</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX41 spec -->
 					<execution>
-						<id>unpack-fixt11-sources</id>
-						<phase>generate-sources</phase>
+						<id>check-fix41-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>unpack</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.quickfixj</groupId>
-									<artifactId>quickfixj-messages-fixt11</artifactId>
-									<classifier>sources</classifier>
-									<version>${project.version}</version>
-									<includes>**/*.java</includes>
-									<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
-								</artifactItem>
-							</artifactItems>
+							<name>fix41.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix41/src/main/resources</directory>
+								<includes>
+									<include>FIX41.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix41</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.quickfixj</groupId>
-				<artifactId>quickfixj-codegenerator</artifactId>
-				<version>${project.version}</version>
-				<executions>
+					<!-- Check FIX42 spec -->
 					<execution>
-						<id>fix40</id>
+						<id>check-fix42-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix40/src/main/resources/FIX40.xml</dictFile>
-							<packaging>quickfix.fix40</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix42.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix42/src/main/resources</directory>
+								<includes>
+									<include>FIX42.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix42</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX43 spec -->
 					<execution>
-						<id>fix41</id>
+						<id>check-fix43-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix41/src/main/resources/FIX41.xml</dictFile>
-							<packaging>quickfix.fix41</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix43.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix43/src/main/resources</directory>
+								<includes>
+									<include>FIX43.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix43</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX44 spec -->
 					<execution>
-						<id>fix42</id>
+						<id>check-fix44-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix42/src/main/resources/FIX42.xml</dictFile>
-							<packaging>quickfix.fix42</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix44.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix44/src/main/resources</directory>
+								<includes>
+									<include>FIX44.modified.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix44</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX50 spec -->
 					<execution>
-						<id>fix43</id>
+						<id>check-fix50-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix43/src/main/resources/FIX43.xml</dictFile>
-							<packaging>quickfix.fix43</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix50.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50/src/main/resources</directory>
+								<includes>
+									<include>FIX50.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix50</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX50SP1 spec -->
 					<execution>
-						<id>fix44</id>
+						<id>check-fix50sp1-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix44/src/main/resources/FIX44.modified.xml</dictFile>
-							<packaging>quickfix.fix44</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix50sp1.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50sp1/src/main/resources</directory>
+								<includes>
+									<include>FIX50SP1.modified.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix50sp1</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+					<!-- Check FIX50SP2 spec -->
 					<execution>
-						<id>fix50</id>
+						<id>check-fix50sp2-spec</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>uptodate-property</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix50/src/main/resources/FIX50.xml</dictFile>
-							<packaging>quickfix.fix50</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<name>fix50sp2.spec.uptodate</name>
+							<fileSet>
+								<directory>../quickfixj-messages-fix50sp2/src/main/resources</directory>
+								<includes>
+									<include>FIX50SP2.modified.xml</include>
+								</includes>
+								<outputDirectory>${project.build.directory}/generated-sources/quickfix/fix50sp2</outputDirectory>
+								<mapper>
+									<type>glob</type>
+									<from>*.xml</from>
+									<to>*.java</to>
+								</mapper>
+							</fileSet>
+							<value>true</value>
+							<elseValue>false</elseValue>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
 					<execution>
-						<id>fix50sp1</id>
+						<id>unpack-repository</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>unpack</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
-							<packaging>quickfix.fix50sp1</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.quickfixj</groupId>
+									<artifactId>quickfixj-orchestration</artifactId>
+									<version>${project.version}</version>
+									<includes>**/FIX*.xml,**/Orchestra*.xml</includes>
+									<outputDirectory>${project.build.directory}/dependency/repository</outputDirectory>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
 					<execution>
-						<id>fix50sp2</id>
+						<id>unpack-fixt11-sources</id>
+						<phase>generate-sources</phase>
 						<goals>
-							<goal>generate</goal>
+							<goal>unpack</goal>
 						</goals>
 						<configuration>
-							<dictFile>../quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
-							<packaging>quickfix.fix50sp2</packaging>
-							<fieldPackage>quickfix.field</fieldPackage>
-							<decimal>${generator.decimal}</decimal>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.quickfixj</groupId>
+									<artifactId>quickfixj-messages-fixt11</artifactId>
+									<classifier>sources</classifier>
+									<version>${project.version}</version>
+									<includes>**/*.java</includes>
+									<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<!-- Empty plugin with no executions - executions are added in profiles based on uptodate properties -->
+			<plugin>
+				<groupId>org.quickfixj</groupId>
+				<artifactId>quickfixj-codegenerator</artifactId>
+				<version>${project.version}</version>
+			</plugin>
 			<!-- exclude classes that are provided by the quickfixj-base dependency -->
 			<plugin>
 			  <groupId>org.apache.maven.plugins</groupId>