diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 7225ab6089c0efe2ac71bfa3cad0f5fea85b941e..43209cbaf689ea83e9f3ee6c7a1dbb1c6f5fd6f4 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -216,6 +216,7 @@ public abstract class ItemGroupMixIn {
     public synchronized TopLevelItem createProjectFromXML(String name, InputStream xml) throws IOException {
         acl.checkPermission(Job.CREATE);
 
+        Jenkins.getInstance().getProjectNamingStrategy().checkName(name);
         // place it as config.xml
         File configXml = Items.getConfigFile(getRootDirFor(name)).getFile();
         configXml.getParentFile().mkdirs();
@@ -241,6 +242,7 @@ public abstract class ItemGroupMixIn {
             throws IOException {
         acl.checkPermission(Job.CREATE);
 
+        Jenkins.getInstance().getProjectNamingStrategy().checkName(name);
         if(parent.getItem(name)!=null)
             throw new IllegalArgumentException("Project of the name "+name+" already exists");
 
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index ca770000967b57d5798c2e56bc232b968902f39b..253ce8ca17a6019a828e09c3e622bb0b04012170 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -50,8 +50,6 @@ import hudson.util.DataSetBuilder;
 import hudson.util.DescribableList;
 import hudson.util.FormApply;
 import hudson.util.Graph;
-import hudson.util.HttpResponses;
-import hudson.util.IOException2;
 import hudson.util.RunList;
 import hudson.util.ShiftedCategoryAxis;
 import hudson.util.StackedAreaRenderer2;
@@ -60,6 +58,7 @@ import hudson.widgets.HistoryWidget;
 import hudson.widgets.HistoryWidget.Adapter;
 import hudson.widgets.Widget;
 import jenkins.model.Jenkins;
+import jenkins.model.ProjectNamingStrategy;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 import org.jfree.chart.ChartFactory;
@@ -992,11 +991,16 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
             save();
 
             String newName = req.getParameter("name");
+            final ProjectNamingStrategy namingStrategy = Jenkins.getInstance().getProjectNamingStrategy();
             if (newName != null && !newName.equals(name)) {
                 // check this error early to avoid HTTP response splitting.
                 Jenkins.checkGoodName(newName);
+                namingStrategy.checkName(newName);
                 rsp.sendRedirect("rename?newName=" + URLEncoder.encode(newName, "UTF-8"));
             } else {
+                if(namingStrategy.isForceExistingJobs()){
+                    namingStrategy.checkName(name);
+                }
                 FormApply.success(".").generateResponse(req, rsp, null);
             }
         } catch (JSONException e) {
diff --git a/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d15aa012f4b4dcb075286875b43cf88db36525e
--- /dev/null
+++ b/core/src/main/java/jenkins/model/GlobalProjectNamingStrategyConfiguration.java
@@ -0,0 +1,61 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2012, Dominik Bartholdi
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.model;
+
+import hudson.Extension;
+import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy;
+import net.sf.json.JSONObject;
+
+import org.kohsuke.stapler.StaplerRequest;
+
+/**
+ * Configures the project naming strategy.
+ * 
+ * @author Dominik Bartholdi (imod)
+ */
+@Extension(ordinal = 250)
+public class GlobalProjectNamingStrategyConfiguration extends GlobalConfiguration {
+
+    @Override
+    public boolean configure(StaplerRequest req, JSONObject json) throws hudson.model.Descriptor.FormException {
+        // for compatibility reasons, the actual value is stored in Jenkins
+        Jenkins j = Jenkins.getInstance();
+        final JSONObject optJSONObject = json.optJSONObject("useProjectNamingStrategy");
+        if (optJSONObject != null) {
+            final JSONObject strategyObject = optJSONObject.getJSONObject("namingStrategy");
+            final String className = strategyObject.getString("stapler-class");
+            try {
+                Class clazz = Class.forName(className);
+                final ProjectNamingStrategy strategy = (ProjectNamingStrategy) req.bindJSON(clazz, strategyObject);
+                j.setProjectNamingStrategy(strategy);
+            } catch (ClassNotFoundException e) {
+                throw new FormException(e, "namingStrategy");
+            }
+        }
+        if (j.getProjectNamingStrategy() == null) {
+            j.setProjectNamingStrategy(DefaultProjectNamingStrategy.DEFAULT_NAMING_STRATEGY);
+        }
+        return true;
+    }
+}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 2ac2aaf27de514eb42643752d48e71cfc5c21267..df4fd000c2613dcef60d2c6e11eec4b8bc915e17 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -192,6 +192,7 @@ import hudson.widgets.Widget;
 import jenkins.ExtensionComponentSet;
 import jenkins.ExtensionRefreshException;
 import jenkins.InitReactorRunner;
+import jenkins.model.ProjectNamingStrategy.DefaultProjectNamingStrategy;
 import net.sf.json.JSONObject;
 import org.acegisecurity.AccessDeniedException;
 import org.acegisecurity.AcegiSecurityException;
@@ -365,6 +366,11 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
      * @see #setSecurityRealm(SecurityRealm)
      */
     private volatile SecurityRealm securityRealm = SecurityRealm.NO_AUTHENTICATION;
+    
+    /**
+     * The project naming strategy defines/restricts the names which can be given to a project/job. e.g. does the name have to follow a naming convention?
+     */
+    private ProjectNamingStrategy projectNamingStrategy = DefaultProjectNamingStrategy.DEFAULT_NAMING_STRATEGY;
 
     /**
      * Root directory for the workspaces. This value will be variable-expanded against
@@ -1863,6 +1869,10 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
     public boolean isUseSecurity() {
         return securityRealm!=SecurityRealm.NO_AUTHENTICATION || authorizationStrategy!=AuthorizationStrategy.UNSECURED;
     }
+    
+    public boolean isUseProjectNamingStrategy(){
+        return projectNamingStrategy != DefaultProjectNamingStrategy.DEFAULT_NAMING_STRATEGY;
+    }
 
     /**
      * If true, all the POST requests to Hudson would have to have crumb in it to protect
@@ -1933,6 +1943,13 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
         markupFormatter = null;
     }
 
+    public void setProjectNamingStrategy(ProjectNamingStrategy ns) {
+        if(ns == null){
+            ns = DefaultProjectNamingStrategy.DEFAULT_NAMING_STRATEGY;
+        }
+        projectNamingStrategy = ns;
+    }
+    
     public Lifecycle getLifecycle() {
         return Lifecycle.get();
     }
@@ -2041,6 +2058,14 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
     public AuthorizationStrategy getAuthorizationStrategy() {
         return authorizationStrategy;
     }
+    
+    /**
+     * The strategy used to check the project names.
+     * @return never <code>null</code>
+     */
+    public ProjectNamingStrategy getProjectNamingStrategy() {
+        return projectNamingStrategy == null ? ProjectNamingStrategy.DEFAULT_NAMING_STRATEGY : projectNamingStrategy;
+    }
 
     /**
      * Returns true if Hudson is quieting down.
@@ -2773,6 +2798,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
     private String checkJobName(String name) throws Failure {
         checkGoodName(name);
         name = name.trim();
+        projectNamingStrategy.checkName(name);
         if(getItem(name)!=null)
             throw new Failure(Messages.Hudson_JobAlreadyExists(name));
         // looks good
@@ -3787,4 +3813,5 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
         assert PERMISSIONS!=null;
         assert ADMINISTER!=null;
     }
+
 }
diff --git a/core/src/main/java/jenkins/model/ProjectNamingStrategy.java b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java
new file mode 100644
index 0000000000000000000000000000000000000000..42d2830c857e0810192c99b542bc937cf3916bd3
--- /dev/null
+++ b/core/src/main/java/jenkins/model/ProjectNamingStrategy.java
@@ -0,0 +1,174 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2012, Dominik Bartholdi
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package jenkins.model;
+
+import hudson.DescriptorExtensionList;
+import hudson.Extension;
+import hudson.ExtensionPoint;
+import hudson.model.Describable;
+import hudson.model.Descriptor;
+import hudson.model.Failure;
+
+import java.io.Serializable;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+import org.kohsuke.stapler.DataBoundConstructor;
+
+/**
+ * This ExtensionPoint allows to enforce the name of projects/jobs.
+ * 
+ * @author Dominik Bartholdi (imod)
+ */
+public abstract class ProjectNamingStrategy implements Describable<ProjectNamingStrategy>, ExtensionPoint {
+
+    public ProjectNamingStrategyDescriptor getDescriptor() {
+        return (ProjectNamingStrategyDescriptor) Jenkins.getInstance().getDescriptor(getClass());
+    }
+
+    public static DescriptorExtensionList<ProjectNamingStrategy, ProjectNamingStrategyDescriptor> all() {
+        return Jenkins.getInstance().<ProjectNamingStrategy, ProjectNamingStrategyDescriptor> getDescriptorList(ProjectNamingStrategy.class);
+    }
+
+    /**
+     * Called when creating a new job.
+     * 
+     * @param name
+     *            the name given from the UI
+     * @throws Failure
+     *             if the user has to be informed about an illegal name, forces the user to change the name before submitting. The message of the failure will be presented to the user.
+     */
+    public void checkName(String name) throws Failure {
+        // no op
+    }
+
+    /**
+     * This flag can be used to force existing jobs to be migrated to a new naming strategy - if this method returns true, the naming will be enforced at every config change. If <code>false</code> is
+     * returned, only new jobs have to follow the strategy.
+     * 
+     * @return <code>true</code> if existing jobs should be enforced to confirm to the naming standard.
+     */
+    public boolean isForceExistingJobs() {
+        return false;
+    }
+
+    /**
+     * The default naming strategy which does not restrict the name of a job.
+     */
+    public static final ProjectNamingStrategy DEFAULT_NAMING_STRATEGY = new DefaultProjectNamingStrategy();
+
+    /**
+     * Default implementation which does not restrict the name to any form.
+     */
+    public static final class DefaultProjectNamingStrategy extends ProjectNamingStrategy implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        @DataBoundConstructor
+        public DefaultProjectNamingStrategy() {
+        }
+
+        @Override
+        public void checkName(String origName) throws Failure {
+            // default - should just do nothing (this is how Jenkins worked before introducing this ExtensionPoint)
+        }
+
+        /**
+         * DefaultProjectNamingStrategy is stateless, therefore save to keep the same instance
+         */
+        private Object readResolve() {
+            return DEFAULT_NAMING_STRATEGY;
+        }
+
+        @Extension
+        public static final class DescriptorImpl extends ProjectNamingStrategyDescriptor {
+            @Override
+            public String getDisplayName() {
+                return "Default";
+            }
+
+            @Override
+            public String getHelpFile() {
+                return "help/system-config/defaultJobNamingStrategy.html";
+            }
+        }
+    }
+
+    /**
+     * Naming strategy which allows the admin to define a pattern a job's name has to follow.
+     */
+    public static final class PatternProjectNamingStrategy extends ProjectNamingStrategy implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * regex pattern a job's name has to follow
+         */
+        private final String namePattern;
+
+        private boolean forceExistingJobs;
+
+        @DataBoundConstructor
+        public PatternProjectNamingStrategy(String namePattern, boolean forceExistingJobs) {
+            this.namePattern = namePattern;
+            this.forceExistingJobs = forceExistingJobs;
+        }
+
+        @Override
+        public void checkName(String name) throws Failure {
+            if (StringUtils.isNotBlank(namePattern) && StringUtils.isNotBlank(name)) {
+                if (!Pattern.matches(namePattern, name)) {
+                    throw new Failure(jenkins.model.Messages._Hudson_JobNameConventionNotApplyed(name, namePattern).toString());
+                }
+            }
+        }
+
+        public String getNamePattern() {
+            return namePattern;
+        }
+
+        public boolean isForceExistingJobs() {
+            return forceExistingJobs;
+        }
+
+        @Extension
+        public static final class DescriptorImpl extends ProjectNamingStrategyDescriptor {
+
+            public static final String DEFAULT_PATTERN = ".*";
+
+            @Override
+            public String getDisplayName() {
+                return "Pattern";
+            }
+
+            @Override
+            public String getHelpFile() {
+                return "help/system-config/patternJobNamingStrategy.html";
+            }
+        }
+    }
+
+    public static abstract class ProjectNamingStrategyDescriptor extends Descriptor<ProjectNamingStrategy> {
+    }
+
+}
diff --git a/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.groovy b/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.groovy
new file mode 100644
index 0000000000000000000000000000000000000000..2be2077f72bfeb287d62ff78cea8132fb7675cc6
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.groovy
@@ -0,0 +1,15 @@
+package jenkins.model.GlobalProjectNamingStrategyConfiguration
+
+import jenkins.model.ProjectNamingStrategy
+
+def f=namespace(lib.FormTagLib)
+
+f.optionalBlock( field:"useProjectNamingStrategy", title:_("useNamingStrategy"), checked:app.useProjectNamingStrategy) {
+
+    f.entry(title:_("namingStrategyTitel")) {
+        table(style:"width:100%") {
+            f.descriptorRadioList(title:_("strategy"), varName:"namingStrategy", instance:app.projectNamingStrategy, descriptors:ProjectNamingStrategy.all())
+        }
+    }
+
+}
diff --git a/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.properties b/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4a4ac6fca4d4a770938598f8204e0907d68afea5
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/GlobalProjectNamingStrategyConfiguration/config.properties
@@ -0,0 +1,27 @@
+# The MIT License
+# 
+# Copyright (c) 2012, Dominik Bartholdi
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+useNamingStrategy = Restrict project naming
+namingStrategyTitel = Naming Strategy
+strategy = Strategy
+
+
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
index 3c41b49e94e7742d3ca8decf3e3f5d3e1f729cff..5b5c49c42d670d890e196374c65f6c0682f91558 100644
--- a/core/src/main/resources/jenkins/model/Messages.properties
+++ b/core/src/main/resources/jenkins/model/Messages.properties
@@ -33,6 +33,7 @@ Hudson.NoJavaInPath=java is not in your PATH. Maybe you need to <a href=''{0}/co
 Hudson.NoName=No name is specified
 Hudson.NodeBeingRemoved=Node is being removed
 Hudson.UnsafeChar=''{0}'' is an unsafe character
+Hudson.JobNameConventionNotApplyed=''{0}'' does not match the job name convention pattern {1}
 Hudson.ViewAlreadyExists=A view already exists with the name "{0}"
 Hudson.ViewName=All
 Hudson.NotUsesUTF8ToDecodeURL=\
diff --git a/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.groovy b/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.groovy
new file mode 100644
index 0000000000000000000000000000000000000000..6c6da9aa7ede68b9dbdd08ac3596cad09c162c6a
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.groovy
@@ -0,0 +1,12 @@
+package jenkins.model.GlobalProjectNamingStrategyConfiguration
+
+
+def f=namespace(lib.FormTagLib)
+
+f.entry(title:_("namePattern")) {
+    f.textbox(name:"namePattern",value:h.defaulted(instance?.namePattern, descriptor.DEFAULT_PATTERN),class:"fixed-width")
+}
+f.entry(title:_("forceExistingJobs"), field:"forceExistingJobs") {
+    f.checkbox(name:"forceExistingJobs")
+}
+
diff --git a/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.properties b/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.properties
new file mode 100644
index 0000000000000000000000000000000000000000..9efe25684963ddd74ffbbe8b8d4a8836a67033e4
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/ProjectNamingStrategy/PatternProjectNamingStrategy/config.properties
@@ -0,0 +1,26 @@
+# The MIT License
+# 
+# Copyright (c) 2012, Dominik Bartholdi
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+namePattern = Name Pattern
+forceExistingJobs = force existing
+
+
diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java
index e1e448ac17852c73370348119157e331e6eaf669..f5f66d79971a5af079425df32cf8a9d80e67e879 100644
--- a/test/src/test/java/hudson/model/JobTest.java
+++ b/test/src/test/java/hudson/model/JobTest.java
@@ -31,6 +31,10 @@ import com.gargoylesoftware.htmlunit.TextPage;
 import hudson.util.TextFile;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
+
+import jenkins.model.ProjectNamingStrategy;
+
+import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.recipes.LocalData;
@@ -239,4 +243,20 @@ public class JobTest extends HudsonTestCase {
         project.setDescription(null);
         assertEquals("", ((TextPage) wc.goTo("job/project/description", "text/plain")).getContent());
     }
+    
+    public void testProjectNamingStrategy() throws Exception {
+        hudson.setProjectNamingStrategy(new ProjectNamingStrategy.PatternProjectNamingStrategy("DUMMY.*", false));
+        final FreeStyleProject p = createFreeStyleProject("DUMMY_project");
+        assertNotNull("no project created", p);
+        try {
+            createFreeStyleProject("project");
+            fail("should not get here, the project name is not allowed, therefore the creation must fail!");
+        } catch (Failure e) {
+            // OK, expected
+        }finally{
+            // set it back to the default naming strategy, otherwise all other tests would fail to create jobs!
+            hudson.setProjectNamingStrategy(ProjectNamingStrategy.DEFAULT_NAMING_STRATEGY);
+        }
+        createFreeStyleProject("project");
+    }
 }
diff --git a/war/src/main/webapp/help/system-config/defaultJobNamingStrategy.html b/war/src/main/webapp/help/system-config/defaultJobNamingStrategy.html
new file mode 100644
index 0000000000000000000000000000000000000000..7a6564b3f3bbdd8873efe4b5c0596053c8db8436
--- /dev/null
+++ b/war/src/main/webapp/help/system-config/defaultJobNamingStrategy.html
@@ -0,0 +1,3 @@
+<div>
+  This is the default configuration and allows the user the choose any name he likes. 
+</div>
diff --git a/war/src/main/webapp/help/system-config/patternJobNamingStrategy.html b/war/src/main/webapp/help/system-config/patternJobNamingStrategy.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc9c24d971fcbdf08a2f127fb4e7eb989493a2d4
--- /dev/null
+++ b/war/src/main/webapp/help/system-config/patternJobNamingStrategy.html
@@ -0,0 +1,5 @@
+<div>
+  Define a pattern (regular expression) to check whether the job name is valid or not. <br>
+  Forcing the check on existing jobs, will allow you to enforce a naming convention on existing jobs - e.g. even if the user does not change the name, 
+  it will be validated with the given pattern at every submit and no updates can be made until the name confirms. 
+</div>