diff --git a/bloom/generators/debian/generator.py b/bloom/generators/debian/generator.py
index c1abe493..1d33306d 100644
--- a/bloom/generators/debian/generator.py
+++ b/bloom/generators/debian/generator.py
@@ -326,9 +326,9 @@ def generate_substitutions_from_package(
     data['Description'] = format_description(package.description)
     # Websites
     websites = [str(url) for url in package.urls if url.type == 'website']
-    homepage = websites[0] if websites else ''
-    if homepage == '':
-        warning("No homepage set, defaulting to ''")
+    homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package.name, ros_distro)
+    if not websites:
+        warning("No homepage set, defaulting to %s" % homepage)
     data['Homepage'] = homepage
     repositories = [str(url) for url in package.urls if url.type == 'repository']
     repository = repositories[0] if repositories else ''
diff --git a/bloom/generators/rpm/generator.py b/bloom/generators/rpm/generator.py
index 66c8f3fe..01b10e11 100644
--- a/bloom/generators/rpm/generator.py
+++ b/bloom/generators/rpm/generator.py
@@ -220,9 +220,10 @@ def generate_substitutions_from_package(
     data['LicenseFiles'] = sorted(set(l.file for l in package.licenses if l.file))
     # Websites
     websites = [str(url) for url in package.urls if url.type == 'website']
-    data['Homepage'] = websites[0] if websites else ''
-    if data['Homepage'] == '':
-        warning("No homepage set")
+    homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package, ros_distro)
+    if not websites:
+        warning("No homepage set, defaulting to %s" % homepage)
+    data['Homepage'] = homepage
     # RPM Increment Number
     data['RPMInc'] = rpm_inc
     # Package name