astrofrog · Feb 1, 2014 · Apr 10, 2013 · Apr 12, 2013 · Apr 12, 2013 · Apr 12, 2013
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -84,6 +84,9 @@ New Features
 
 - ``astropy.vo``
 
+  - A new sub-package, `astropy.vo.samp`, is now available (this was previously
+    the SAMPy package, which has been refactored for use in Astropy). [#1907]
+
 - ``astropy.wcs``
 
 API Changes

diff --git a/astropy/vo/__init__.py b/astropy/vo/__init__.py
@@ -0,0 +1,4 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+The `vo` subpackage provides virtual observatory (VO) related functionality.
+"""
diff --git a/astropy/vo/samp/__init__.py b/astropy/vo/samp/__init__.py
@@ -0,0 +1,17 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+This subpackage provides classes to communicate with other applications via the
+`Simple Application Messaging Protocal (SAMP) <www.ivoa.net/samp>`_.
+
+Before integration into Astropy it was known as
+`SAMPy <https://pypi.python.org/pypi/sampy/>`_, and was developed by Luigi Paioro
+(INAF - Istituto Nazionale di Astrofisica).
+"""
+
+from .constants import *
+from .errors import *
+from .utils import *
+from .hub import *
+from .client import *
+from .integrated_client import *
+from .hub_proxy import *