diff --git a/src/cli.vala b/src/cli.vala
index 6e51a673e0fcdad8a31f3c1521442d277e51ed08..184b43b38f21ed51d4ab539963f2ceb6a3b7c107 100644
--- a/src/cli.vala
+++ b/src/cli.vala
@@ -17,8 +17,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const string VERSION = "6.5.0";
-
 namespace Pamac {
 	[DBus (name = "org.manjaro.pamac.user")]
 	interface UserDaemon : Object {
@@ -548,7 +546,7 @@ namespace Pamac {
 		}
 
 		void display_version () {
-			stdout.printf ("Pamac v%s\n", VERSION);
+			stdout.printf ("Pamac %s\n", VERSION);
 		}
 
 		void display_help () {
@@ -719,7 +717,7 @@ namespace Pamac {
 		}
 
 		void display_reinstall_help () {
-			stdout.printf (dgettext (null, "Reinstall packages from the repositories"));
+			stdout.printf (dgettext (null, "Reinstall packages"));
 			stdout.printf ("\n\n");
 			stdout.printf ("pamac reinstall <%s>".printf ("%s,%s".printf (dgettext (null, "package(s)"), dgettext (null, "group(s)"))));
 			stdout.printf ("\n\n");
@@ -1526,7 +1524,7 @@ namespace Pamac {
 			user_daemon.get_updates_finished.disconnect (on_get_updates_for_sysupgrade_finished);
 			uint updates_nb = updates.repos_updates.length + updates.aur_updates.length;
 			if (updates_nb == 0) {
-				stdout.printf ("%s\n", dgettext (null, "Your system is up-do-date"));
+				stdout.printf ("%s\n", dgettext (null, "Your system is up-to-date"));
 			} else {
 				// special status when updates are available
 				cmd.set_exit_status (100);
diff --git a/src/manager_window.vala b/src/manager_window.vala
index 2e11f5013763368469de5644b522bff92297757d..485553ce9108ab08e8d473580f2a35f5f53e68f5 100644
--- a/src/manager_window.vala
+++ b/src/manager_window.vala
@@ -17,8 +17,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const string VERSION = "6.4.0";
-
 namespace Pamac {
 
 	class ActivableCellRendererPixbuf : Gtk.CellRendererPixbuf {
diff --git a/src/meson.build b/src/meson.build
index 35f7e31499e5bfe893165d486d6fa9714718b86d..0fe02463a2d02bbd697ba770ba77b6caf26a6c18 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -35,7 +35,7 @@ transaction_sources = ['transaction.vala', 'choose_provider_dialog.vala', 'trans
 preferences_sources = ['preferences_dialog.vala', 'choose_ignorepkgs_dialog.vala']
 
 executable('pamac',
-	sources: ['cli.vala', 'common.vala', 'package.vala', 'pamac_config.vala'],
+	sources: [common_sources, 'version.vala','cli.vala'],
 	dependencies: [gio, posix, math],
 	vala_args: [common_vala_args, '--pkg=linux'],
 	c_args: common_c_args,
@@ -89,7 +89,7 @@ libpamac = library('pamac',
 libpamac_dep = declare_dependency(link_with: libpamac)
 
 executable('pamac-manager',
-	sources: ['history_dialog.vala', 'manager_window.vala', 'manager.vala', manager_resources],
+	sources: ['version.vala', 'history_dialog.vala', 'manager_window.vala', 'manager.vala', manager_resources],
 	dependencies: [vala_deps, gtk3, gdk3, gdk_pixbuf2, libsoup, libpamac_dep],
 	vala_args: common_vala_args,
 	c_args: common_c_args,
diff --git a/src/version.vala b/src/version.vala
new file mode 100644
index 0000000000000000000000000000000000000000..4e33643c694dee4749f64b8119a645a8548ea6ff
--- /dev/null
+++ b/src/version.vala
@@ -0,0 +1 @@
+const string VERSION = "6.5.0";