diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 3abc6930..48b4d3f4 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -600,12 +600,11 @@ void MainWindow::windowShown(void)
 	//Check for expiration
 	if(lamexp_version_demo())
 	{
-		QDate expireDate = lamexp_version_date().addDays(14);
-		if(QDate::currentDate() >= expireDate)
+		if(QDate::currentDate() >= lamexp_version_expires())
 		{
 			qWarning("Binary has expired !!!");
 			PlaySound(MAKEINTRESOURCE(IDR_WAVE_WHAMMY), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
-			if(QMessageBox::warning(this, tr("LameXP - Expired"), QString("<nobr>%1<br>%2</nobr>").arg(tr("This demo (pre-release) version of LameXP has expired at %1.").arg(expireDate.toString(Qt::ISODate)), tr("LameXP is free software and release versions won't expire.")), tr("Check for Updates"), tr("Exit Program")) == 0)
+			if(QMessageBox::warning(this, tr("LameXP - Expired"), QString("<nobr>%1<br>%2</nobr>").arg(tr("This demo (pre-release) version of LameXP has expired at %1.").arg(lamexp_version_expires().toString(Qt::ISODate)), tr("LameXP is free software and release versions won't expire.")), tr("Check for Updates"), tr("Exit Program")) == 0)
 			{
 				checkUpdatesActionActivated();
 			}
diff --git a/src/Global.cpp b/src/Global.cpp
index 0a563f95..9733f45f 100644
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -160,6 +160,11 @@ bool lamexp_version_demo(void)
 	return LAMEXP_DEBUG || !(strstr(g_lamexp_version_release, "Final") || strstr(g_lamexp_version_release, "Hotfix"));
 }
 
+QDate lamexp_version_expires(void)
+{
+	return lamexp_version_date().addDays(30);
+}
+
 /*
  * Get build date date
  */
diff --git a/src/Global.h b/src/Global.h
index 4ee912cb..01f4067b 100644
--- a/src/Global.h
+++ b/src/Global.h
@@ -74,6 +74,7 @@ const QDate &lamexp_version_date(void);
 const char *lamexp_version_release(void);
 bool lamexp_version_demo(void);
 const char *lamexp_version_compiler(void);
+QDate lamexp_version_expires(void);
 unsigned int lamexp_toolver_neroaac(void);
 
 //Public functions
diff --git a/src/Main.cpp b/src/Main.cpp
index 6ba3130e..d8110223 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -81,8 +81,7 @@ int lamexp_main(int argc, char* argv[])
 	//Check for expiration
 	if(lamexp_version_demo())
 	{
-		QDate expireDate = lamexp_version_date().addDays(14);
-		qWarning(QString("Note: This demo (pre-release) version of LameXP will expire at %1.\n").arg(expireDate.toString(Qt::ISODate)).toLatin1().constData());
+		qWarning(QString("Note: This demo (pre-release) version of LameXP will expire at %1.\n").arg(lamexp_version_expires().toString(Qt::ISODate)).toLatin1().constData());
 	}
 
 	//Check for multiple instances of LameXP