diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-0.5.0.0beta1.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-0.5.0.0beta1.eb
new file mode 100644
index 00000000000..434df6f94dc
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-0.5.0.0beta1.eb
@@ -0,0 +1,59 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '0.5.0.0beta1'
+
+homepage = 'https://easybuild.io'
+description = """EasyBuild is a software build and installation framework
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
+
+toolchain = SYSTEM
+
+sources = [
+    {
+        'filename': 'easybuild-framework-v%s.tar.gz' % version[2:],
+        'git_config': {
+            'url': 'https://github.com/easybuilders',
+            'repo_name': 'easybuild-framework',
+            'tag': 'easybuild-framework-v%s' % version[2:],
+            'keep_git_dir': True,
+        },
+    },
+    {
+        'filename': 'easybuild-easyblocks-v%s.tar.gz' % version[2:],
+        'git_config': {
+            'url': 'https://github.com/easybuilders',
+            'repo_name': 'easybuild-easyblocks',
+            'tag': 'easybuild-easyblocks-v%s' % version[2:],
+            'keep_git_dir': True,
+        },
+    },
+    {
+        'filename': 'easybuild-easyconfigs-v%s.tar.gz' % version[2:],
+        'git_config': {
+            'url': 'https://github.com/easybuilders',
+            'repo_name': 'easybuild-easyconfigs',
+            'tag': 'easybuild-easyconfigs-v%s' % version[2:],
+            'keep_git_dir': True,
+        },
+    },
+]
+checksums = [
+    None,
+    None,
+    None,
+]
+
+# EasyBuild is a (set of) Python packages, so it depends on Python
+# usually, we want to use the system Python, so no actual Python dependency is listed
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
+
+sanity_check_paths = {
+    'files': ['bin/eb'],
+    'dirs': ['lib/python%s/site-packages' % local_pyshortver],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
deleted file mode 100644
index ed54b7bbacd..00000000000
--- a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-5.0.0beta1.eb
+++ /dev/null
@@ -1,35 +0,0 @@
-easyblock = 'EB_EasyBuildMeta'
-
-name = 'EasyBuild'
-version = '5.0.0beta1'
-
-homepage = 'https://easybuild.io'
-description = """EasyBuild is a software build and installation framework
- written in Python that allows you to install software in a structured,
- repeatable and robust way."""
-
-toolchain = SYSTEM
-
-source_urls = [
-    'https://github.com/easybuilders/easybuild-framework/archive/',
-    'https://github.com/easybuilders/easybuild-easyblocks/archive/',
-    'https://github.com/easybuilders/easybuild-easyconfigs/archive/',
-]
-sources = [
-    'easybuild-framework-v%(version)s.tar.gz',
-    'easybuild-easyblocks-v%(version)s.tar.gz',
-    'easybuild-easyconfigs-v%(version)s.tar.gz',
-]
-
-# EasyBuild is a (set of) Python packages, so it depends on Python
-# usually, we want to use the system Python, so no actual Python dependency is listed
-allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
-
-local_pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
-
-sanity_check_paths = {
-    'files': ['bin/eb'],
-    'dirs': ['lib/python%s/site-packages' % local_pyshortver],
-}
-
-moduleclass = 'tools'