diff --git a/rpms/awips2.core/Installer.groovy/component.spec b/rpms/awips2.core/Installer.groovy/component.spec
new file mode 100644
index 0000000000..fe2cb96df2
--- /dev/null
+++ b/rpms/awips2.core/Installer.groovy/component.spec
@@ -0,0 +1,99 @@
+%define _groovy_version 2.1.3
+#
+# AWIPS II Groovy Spec File
+#
+Name: awips2-groovy
+Summary: AWIPS II Groovy Distribution
+Version: %{_groovy_version}
+Release: 1
+Group: AWIPSII
+BuildRoot: %{_build_root}
+BuildArch: noarch
+URL: N/A
+License: N/A
+Distribution: N/A
+Vendor: Raytheon
+Packager: Bryan Kowal
+
+AutoReq: no
+provides: awips2-groovy
+requires: awips2-java
+
+%description
+AWIPS II Groovy Distribution - Contains Groovy %{_groovy_version}.
+
+%prep
+# Ensure that a "buildroot" has been specified.
+if [ "%{_build_root}" = "" ]; then
+   echo "ERROR: A BuildRoot has not been specified."
+   echo "FATAL: Unable to Continue ... Terminating."
+   exit 1
+fi
+
+if [ -d %{_build_root} ]; then
+   rm -rf %{_build_root}
+   if [ $? -ne 0 ]; then
+      exit 1
+   fi
+fi
+
+mkdir -p %{_build_root}/awips2
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p %{_build_root}/etc/profile.d
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+%build
+
+%install
+RPMS_DIRECTORY="%{_baseline_workspace}/rpms"
+INSTALLER_GROOVY="${RPMS_DIRECTORY}/awips2.core/Installer.groovy"
+
+_profile_scripts="${INSTALLER_GROOVY}/scripts/profile.d"
+_groovy_dist="${INSTALLER_GROOVY}/src/groovy-binary-%{_groovy_version}.zip"
+
+unzip ${_groovy_dist} -d %{_build_root}/awips2
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mv  %{_build_root}/awips2/groovy-%{_groovy_version} \
+   %{_build_root}/awips2/groovy
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+cp ${_profile_scripts}/* %{_build_root}/etc/profile.d
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(644,awips,fxalpha,755)
+%attr(755,root,root) /etc/profile.d/awips2Groovy.csh
+%attr(755,root,root) /etc/profile.d/awips2Groovy.sh
+
+%dir /awips2/groovy
+%dir /awips2/groovy/conf
+/awips2/groovy/conf/*
+%dir /awips2/groovy/embeddable
+/awips2/groovy/embeddable/*
+%dir /awips2/groovy/indy
+/awips2/groovy/indy/*
+%dir /awips2/groovy/lib
+/awips2/groovy/lib/*
+%dir /awips2/groovy/bin
+
+%doc /awips2/groovy/ANTLR-LICENSE.txt
+%doc /awips2/groovy/ASM-LICENSE.txt
+%doc /awips2/groovy/CLI-LICENSE.txt
+%doc /awips2/groovy/JSR223-LICENSE.txt
+%doc /awips2/groovy/LICENSE.txt
+%doc /awips2/groovy/NOTICE.txt
+
+%defattr(755,awips,fxalpha,755)
+/awips2/groovy/bin/*
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.csh b/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.csh
new file mode 100644
index 0000000000..d5d57522a6
--- /dev/null
+++ b/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.csh
@@ -0,0 +1,9 @@
+#!/bin/csh
+
+setenv GROOVY_HOME="/awips2/groovy"
+
+if $?PATH then
+   setenv PATH ${GROOVY_HOME}/bin:$PATH
+else
+   setenv PATH ${GROOVY_HOME}/bin
+endif
diff --git a/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.sh b/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.sh
new file mode 100644
index 0000000000..c7e066b2cb
--- /dev/null
+++ b/rpms/awips2.core/Installer.groovy/scripts/profile.d/awips2Groovy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export GROOVY_HOME=/awips2/groovy
+export PATH=${GROOVY_HOME}/bin:${PATH}
diff --git a/rpms/awips2.core/Installer.groovy/src/groovy-binary-2.1.3.zip b/rpms/awips2.core/Installer.groovy/src/groovy-binary-2.1.3.zip
new file mode 100644
index 0000000000..6f5a050c6f
Binary files /dev/null and b/rpms/awips2.core/Installer.groovy/src/groovy-binary-2.1.3.zip differ
diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh
index 40f72f8871..16bba5cf3e 100644
--- a/rpms/build/common/lookupRPM.sh
+++ b/rpms/build/common/lookupRPM.sh
@@ -221,6 +221,10 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.java"
       return 0
    fi
+   if [ "${1}" = "awips2-groovy" ]; then
+      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.groovy"
+      return 0
+   fi
    if [ "${1}" = "awips2-ldm" ]; then
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ldm"
       return 0
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index 7b6f8af305..b6f9ae7e47 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -255,6 +255,7 @@ if [ "${1}" = "-full" ]; then
    fi
    buildRPM "awips2-httpd-pypies"
    buildRPM "awips2-java"
+   buildRPM "awips2-groovy"
    #buildRPM "awips2-ldm"
    buildRPM "awips2-postgres"
    buildRPM "awips2-pgadmin3"
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index 5a7e71041c..288dbdf500 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -210,6 +210,7 @@ if [ "${1}" = "-full" ]; then
    fi
    buildRPM "awips2-httpd-pypies"
    buildRPM "awips2-java"
+   buildRPM "awips2-groovy"
    buildLocalizationRPMs
    if [ $? -ne 0 ]; then
       exit 1