diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java
index ec23e85a1..74c26eef5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java
@@ -16,7 +16,7 @@
 package org.springframework.batch.core.job.flow.support;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.job.flow.support.util.PatternMatcher;
+import org.springframework.batch.support.PatternMatcher;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
index 6ec3a260c..6c19dd964 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
@@ -21,8 +21,8 @@ import java.util.List;
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.job.flow.support.util.PatternMatcher;
 import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.support.PatternMatcher;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/util/PatternMatcher.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java
similarity index 98%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/util/PatternMatcher.java
rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java
index 4d2c5aa40..6aaa3573e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/util/PatternMatcher.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.job.flow.support.util;
+package org.springframework.batch.support;
 
 /**
  * @author Dave Syer