diff --git a/doc/en/user/source/styling/ysld/index.rst b/doc/en/user/source/styling/ysld/index.rst
index 3b657cd5101..39d3578fb83 100644
--- a/doc/en/user/source/styling/ysld/index.rst
+++ b/doc/en/user/source/styling/ysld/index.rst
@@ -3,9 +3,9 @@
 YSLD Styling
 ============
 
-This community module adds support for the YSLD styling language.
+This module adds support for the YSLD styling language.
 
-`YSLD <https://github.com/geotools/geotools/blob/master/modules/unsupported/ysld/README.md>`_ is a YAML based language which closely matches the stucture of SLD, and the internal data model that GeoServer's renderer uses.  For details on YSLD syntax see the reference below or the GeoTools documentation.
+`YSLD <http://docs.geotools.org/latest/userguide/extension/ysld.html>`_ is a YAML based language which closely matches the stucture of SLD, and the internal data model that GeoServer's renderer uses.  For details on YSLD syntax see the reference below or the GeoTools documentation.
 
 YSLD is not a part of GeoServer by default, but is available as an optional install.
 
diff --git a/src/community/pom.xml b/src/community/pom.xml
index cff0bc4ae91..618e6b7f8ed 100644
--- a/src/community/pom.xml
+++ b/src/community/pom.xml
@@ -69,7 +69,6 @@
           <descriptor>release/ext-params-extractor.xml</descriptor>
           <descriptor>release/ext-wps-remote.xml</descriptor>
           <descriptor>release/ext-python.xml</descriptor>
-          <descriptor>release/ext-ysld.xml</descriptor>
           <descriptor>release/ext-jdbcstore.xml</descriptor>
           <descriptor>release/ext-ncwms.xml</descriptor>
           <descriptor>release/ext-gwc-sqlite.xml</descriptor> 
@@ -211,7 +210,6 @@
         <module>jdbcstore</module>
         <module>gdal</module>
         <module>gwc-s3</module>
-        <module>ysld</module>
         <module>backup-restore</module>
         <module>ncwms</module>
         <module>web-resource</module>
@@ -436,12 +434,6 @@
         <module>dem</module>
       </modules>
     </profile>
-    <profile>
-      <id>ysld</id>
-      <modules>
-        <module>ysld</module>
-      </modules>
-    </profile>
     <profile>
       <id>backup-restore</id>
       <modules>
diff --git a/src/extension/pom.xml b/src/extension/pom.xml
index 549873b09a3..21026fd2cc5 100644
--- a/src/extension/pom.xml
+++ b/src/extension/pom.xml
@@ -313,12 +313,17 @@
         <module>netcdf-out</module>
       </modules>
     </profile>
-
- <profile>
+    <profile>
       <id>vectortiles</id>
-        <modules>
-          <module>vectortiles</module>
-        </modules>
+      <modules>
+        <module>vectortiles</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>ysld</id>
+      <modules>
+        <module>ysld</module>
+      </modules>
     </profile>
 
     <!-- allExtensions profile, includes all modules -->
@@ -358,7 +363,8 @@
         <module>grib</module>
         <module>netcdf</module>
         <module>netcdf-out</module>
-	<module>vectortiles</module>
+        <module>vectortiles</module>
+        <module>ysld</module>
       </modules>
     </profile>
 
@@ -400,9 +406,8 @@
         <module>netcdf</module>
         <module>netcdf-out</module>
         <module>vectortiles</module>
+        <module>ysld</module>
       </modules>
     </profile>
-
   </profiles>
-
 </project>
diff --git a/src/community/ysld/pom.xml b/src/extension/ysld/pom.xml
similarity index 95%
rename from src/community/ysld/pom.xml
rename to src/extension/ysld/pom.xml
index 01c3d98df20..184b1b05fff 100644
--- a/src/community/ysld/pom.xml
+++ b/src/extension/ysld/pom.xml
@@ -6,11 +6,11 @@
   
   <parent>
     <groupId>org.geoserver</groupId>
-    <artifactId>community</artifactId>
+    <artifactId>extension</artifactId>
     <version>2.11-SNAPSHOT</version>
   </parent>
   
-  <groupId>org.geoserver.community</groupId>
+  <groupId>org.geoserver</groupId>
   <artifactId>gs-ysld</artifactId>
   <name>Ysld GeoServer Plugin</name>
   <packaging>jar</packaging>
diff --git a/src/community/ysld/src/main/java/org/geoserver/ysld/GWCZoomContextFinder.java b/src/extension/ysld/src/main/java/org/geoserver/ysld/GWCZoomContextFinder.java
similarity index 100%
rename from src/community/ysld/src/main/java/org/geoserver/ysld/GWCZoomContextFinder.java
rename to src/extension/ysld/src/main/java/org/geoserver/ysld/GWCZoomContextFinder.java
diff --git a/src/community/ysld/src/main/java/org/geoserver/ysld/YsldHandler.java b/src/extension/ysld/src/main/java/org/geoserver/ysld/YsldHandler.java
similarity index 100%
rename from src/community/ysld/src/main/java/org/geoserver/ysld/YsldHandler.java
rename to src/extension/ysld/src/main/java/org/geoserver/ysld/YsldHandler.java
diff --git a/src/community/ysld/src/main/resources/applicationContext.xml b/src/extension/ysld/src/main/resources/applicationContext.xml
similarity index 100%
rename from src/community/ysld/src/main/resources/applicationContext.xml
rename to src/extension/ysld/src/main/resources/applicationContext.xml
diff --git a/src/community/ysld/src/main/resources/org/geoserver/ysld/template_generic.ysld b/src/extension/ysld/src/main/resources/org/geoserver/ysld/template_generic.ysld
similarity index 100%
rename from src/community/ysld/src/main/resources/org/geoserver/ysld/template_generic.ysld
rename to src/extension/ysld/src/main/resources/org/geoserver/ysld/template_generic.ysld
diff --git a/src/community/ysld/src/main/resources/org/geoserver/ysld/template_line.ysld b/src/extension/ysld/src/main/resources/org/geoserver/ysld/template_line.ysld
similarity index 100%
rename from src/community/ysld/src/main/resources/org/geoserver/ysld/template_line.ysld
rename to src/extension/ysld/src/main/resources/org/geoserver/ysld/template_line.ysld
diff --git a/src/community/ysld/src/main/resources/org/geoserver/ysld/template_point.ysld b/src/extension/ysld/src/main/resources/org/geoserver/ysld/template_point.ysld
similarity index 100%
rename from src/community/ysld/src/main/resources/org/geoserver/ysld/template_point.ysld
rename to src/extension/ysld/src/main/resources/org/geoserver/ysld/template_point.ysld
diff --git a/src/community/ysld/src/main/resources/org/geoserver/ysld/template_polygon.ysld b/src/extension/ysld/src/main/resources/org/geoserver/ysld/template_polygon.ysld
similarity index 100%
rename from src/community/ysld/src/main/resources/org/geoserver/ysld/template_polygon.ysld
rename to src/extension/ysld/src/main/resources/org/geoserver/ysld/template_polygon.ysld
diff --git a/src/community/ysld/src/main/resources/org/geoserver/ysld/template_raster.ysld b/src/extension/ysld/src/main/resources/org/geoserver/ysld/template_raster.ysld
similarity index 100%
rename from src/community/ysld/src/main/resources/org/geoserver/ysld/template_raster.ysld
rename to src/extension/ysld/src/main/resources/org/geoserver/ysld/template_raster.ysld
diff --git a/src/community/ysld/src/test/java/org/geoserver/ysld/GWCZoomContextFinderTest.java b/src/extension/ysld/src/test/java/org/geoserver/ysld/GWCZoomContextFinderTest.java
similarity index 100%
rename from src/community/ysld/src/test/java/org/geoserver/ysld/GWCZoomContextFinderTest.java
rename to src/extension/ysld/src/test/java/org/geoserver/ysld/GWCZoomContextFinderTest.java
diff --git a/src/community/ysld/src/test/java/org/geoserver/ysld/ResourceLocatorTest.java b/src/extension/ysld/src/test/java/org/geoserver/ysld/ResourceLocatorTest.java
similarity index 100%
rename from src/community/ysld/src/test/java/org/geoserver/ysld/ResourceLocatorTest.java
rename to src/extension/ysld/src/test/java/org/geoserver/ysld/ResourceLocatorTest.java
diff --git a/src/community/ysld/src/test/java/org/geoserver/ysld/YsldStyleGeneratorTest.java b/src/extension/ysld/src/test/java/org/geoserver/ysld/YsldStyleGeneratorTest.java
similarity index 100%
rename from src/community/ysld/src/test/java/org/geoserver/ysld/YsldStyleGeneratorTest.java
rename to src/extension/ysld/src/test/java/org/geoserver/ysld/YsldStyleGeneratorTest.java
diff --git a/src/pom.xml b/src/pom.xml
index 05b3f88af24..6cfe8f014ad 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -1434,6 +1434,7 @@
       <descriptor>release/ext-netcdf.xml</descriptor>
       <descriptor>release/ext-netcdf-out.xml</descriptor>
       <descriptor>release/ext-vectortiles.xml</descriptor>
+      <descriptor>release/ext-ysld.xml</descriptor>
      </descriptors>
      <finalName>geoserver-2.11-SNAPSHOT</finalName>
      <outputDirectory>${project.build.directory}/release</outputDirectory>
diff --git a/src/community/release/ext-ysld.xml b/src/release/ext-ysld.xml
similarity index 100%
rename from src/community/release/ext-ysld.xml
rename to src/release/ext-ysld.xml