diff --git a/README.rst b/README.rst
index 8180fd2ab..177ad27f1 100644
--- a/README.rst
+++ b/README.rst
@@ -65,7 +65,7 @@ Main features
 
 **Platforms Borg works on**
   * Linux
-  * FreeBSD
+  * FreeBSD, OpenBSD, NetBSD
   * Mac OS X
   * Cygwin (unsupported)
 
diff --git a/docs/faq.rst b/docs/faq.rst
index d13fe67f1..a51ddc2c1 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -41,7 +41,7 @@ Which file types, attributes, etc. are preserved?
     * User ID of owner
     * Group ID of owner
     * Unix Mode/Permissions (u/g/o permissions, suid, sgid, sticky)
-    * Extended Attributes (xattrs)
+    * Extended Attributes (xattrs) on Linux, OS X and FreeBSD
     * Access Control Lists (ACL_) on Linux, OS X and FreeBSD
     * BSD flags on OS X and FreeBSD
 
diff --git a/setup.py b/setup.py
index 2e5e04b50..e3f66ff9a 100644
--- a/setup.py
+++ b/setup.py
@@ -138,13 +138,15 @@ setup(
     description='Deduplicated, encrypted, authenticated and compressed backups',
     long_description=long_description,
     license='BSD',
-    platforms=['Linux', 'MacOS X', 'FreeBSD', ],
+    platforms=['Linux', 'MacOS X', 'FreeBSD', 'OpenBSD', 'NetBSD', ],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
         'Intended Audience :: System Administrators',
         'License :: OSI Approved :: BSD License',
         'Operating System :: POSIX :: BSD :: FreeBSD',
+        'Operating System :: POSIX :: BSD :: OpenBSD',
+        'Operating System :: POSIX :: BSD :: NetBSD',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
@@ -152,6 +154,7 @@ setup(
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
     ],
diff --git a/tox.ini b/tox.ini
index a120a237a..d177c121a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py32, py33, py34
+envlist = py32, py33, py34, py35
 
 [testenv]
 # Change dir to avoid import problem for cython code. The directory does