diff --git a/orcasong/tools/shuffle2.py b/orcasong/tools/shuffle2.py
index caef013670c402660beec80f086c20cfea40ef84..1d85fa378db5b8ef6d3af632de915beee6d53114 100644
--- a/orcasong/tools/shuffle2.py
+++ b/orcasong/tools/shuffle2.py
@@ -303,7 +303,3 @@ def h5shuffle2():
                 "delete": True
             }
         shuffle_v2(**kwargs, **stgs, chunks=True)
-
-
-if __name__ == '__main__':
-    h5shuffle2()
diff --git a/setup.py b/setup.py
index 23137e0e2fd554dffc6366b1ff331497db9c901b..f956c809c3cc4e90b82bf7e52611e3edce18d90a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,10 +29,10 @@ setup(
     entry_points={'console_scripts': [
         'concatenate=orcasong.tools.concatenate:main',
         'h5shuffle=orcasong.tools.postproc:h5shuffle',
+        'h5shuffle2=orcasong.tools.shuffle2:h5shuffle2',
         'plot_binstats=orcasong.plotting.plot_binstats:main',
         'make_nn_images=legacy.make_nn_images:main',
         'make_dsplit=orcasong_contrib.data_tools.make_data_split.make_data_split:main']}
-
 )
 
-__author__ = 'Stefan Reck, Michael Moser'
+__author__ = 'Stefan Reck, Michael Moser, Daniel Guderian'