diff --git a/devel/setup.py b/devel/setup.py
index cee6f420..952a84da 100644
--- a/devel/setup.py
+++ b/devel/setup.py
@@ -1,21 +1,8 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp-puppet-devel',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/docs/tech-reference/conf.py b/docs/tech-reference/conf.py
index 2d1d0aef..03fe231b 100644
--- a/docs/tech-reference/conf.py
+++ b/docs/tech-reference/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0'
+release = '2.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/user-guide/conf.py b/docs/user-guide/conf.py
index a68cacca..910b143d 100644
--- a/docs/user-guide/conf.py
+++ b/docs/user-guide/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0'
+release = '2.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pulp_puppet_common/setup.py b/pulp_puppet_common/setup.py
index f13b1c0b..cfeeb7a3 100644
--- a/pulp_puppet_common/setup.py
+++ b/pulp_puppet_common/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_common',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/pulp_puppet_extensions_admin/setup.py b/pulp_puppet_extensions_admin/setup.py
index 38fbf7c5..cf939524 100644
--- a/pulp_puppet_extensions_admin/setup.py
+++ b/pulp_puppet_extensions_admin/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_extensions_admin',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/pulp_puppet_extensions_consumer/setup.py b/pulp_puppet_extensions_consumer/setup.py
index 18687f7b..3ec86010 100755
--- a/pulp_puppet_extensions_consumer/setup.py
+++ b/pulp_puppet_extensions_consumer/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_extensions_consumer',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/pulp_puppet_handlers/setup.py b/pulp_puppet_handlers/setup.py
index 8faa1214..25efe2a3 100644
--- a/pulp_puppet_handlers/setup.py
+++ b/pulp_puppet_handlers/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2012 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_handlers',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/pulp_puppet_plugins/setup.py b/pulp_puppet_plugins/setup.py
index 933ac819..710dda96 100644
--- a/pulp_puppet_plugins/setup.py
+++ b/pulp_puppet_plugins/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2013 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_plugins',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',
diff --git a/pulp_puppet_tools/setup.py b/pulp_puppet_tools/setup.py
index 358def6d..c5f1f7e0 100644
--- a/pulp_puppet_tools/setup.py
+++ b/pulp_puppet_tools/setup.py
@@ -1,19 +1,8 @@
-# Copyright (c) 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 from setuptools import setup, find_packages
 
 setup(
     name='pulp_puppet_tools',
-    version='2.4.0',
+    version='2.5.0',
     license='GPLv2+',
     packages=find_packages(exclude=['test', 'test.*']),
     author='Pulp Team',