diff --git a/library/language/source/main.php b/library/language/source/main.php
index fce5e5d19..08e34ebee 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -234,7 +234,8 @@ $lang['RULES_VOTE_CAN'] = 'You <b>can</b> vote in polls in this forum';
 $lang['RULES_VOTE_CANNOT'] = 'You <b>cannot</b> vote in polls in this forum';
 $lang['RULES_MODERATE'] = 'You <b>can</b> moderate this forum';
 
-$lang['NO_TOPICS_POST_ONE'] = 'There are no posts in this forum.<br />Click on the <b>Post New Topic</b> link on this page to post one.';
+$lang['NO_TOPICS_POST_ONE'] = 'There are no posts in this forum yet<br />Click on the <b>New Topic</b> icon, and your post will be the first.';
+$lang['NO_RELEASES_POST_ONE'] = 'There are no releases in this forum yet<br />Click on the <b>New Release</b> icon, and your release will be the first.';
 
 // Viewtopic
 $lang['VIEW_TOPIC'] = 'View topic';
diff --git a/viewforum.php b/viewforum.php
index 4685097bc..ae0f605d8 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -498,7 +498,7 @@ if ($found_topics) {
     if ($only_new) {
         $no_topics_msg = $lang['NO_NEW_POSTS'];
     } else {
-        $no_topics_msg = ($topic_days || $title_match) ? $lang['NO_SEARCH_MATCH'] : $lang['NO_TOPICS_POST_ONE'];
+        $no_topics_msg = ($topic_days || $title_match) ? $lang['NO_SEARCH_MATCH'] : ($forum_data['allow_reg_tracker'] ? $lang['NO_RELEASES_POST_ONE'] : $lang['NO_TOPICS_POST_ONE']);
     }
     $template->assign_vars(array(
         'NO_TOPICS' => $no_topics_msg,