gui/babeldata.h   | 2 +-
 gui/mainwindow.cc | 4 ++--
 shape.cc          | 2 +-
 shape.h           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gui/babeldata.h b/gui/babeldata.h
index 198f8889..641469d7 100644
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -64,7 +64,7 @@ public:
     upgradeErrors_(0),
     upgradeOffers_(0),
     runCount_(0),
-    startupVersionCheck_(true),
+    startupVersionCheck_(false),
     reportStatistics_(true),
     allowBetaUpgrades_(false),
     ignoreVersionMismatch_(false),
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index 22b2b449..0576e12c 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -26,6 +26,7 @@
 #include <QtCore/QEvent>               // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange)
 #include <QtCore/QFile>                // for QFile
 #include <QtCore/QFileInfo>            // for QFileInfo
+#include <QtCore/QLibraryInfo>
 #include <QtCore/QLocale>              // for QLocale
 #include <QtCore/QMimeData>            // for QMimeData
 #include <QtCore/QProcess>             // for QProcess, QProcess::NotRunning
@@ -219,8 +220,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
 
   ui_.outputWindow->setReadOnly(true);
 
-  langPath_ = QApplication::applicationDirPath();
-  langPath_.append("/translations/");
+  langPath_ = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
 
   // Start up in the current system language.
   loadLanguage(QLocale::system().name());
diff --git a/shape.cc b/shape.cc
index 933eb95a..62955992 100644
--- a/shape.cc
+++ b/shape.cc
@@ -32,7 +32,7 @@
 
 #include "defs.h"
 #include "shape.h"
-#include "shapelib/shapefil.h"
+#include <shapefil.h>
 
 
 #if SHAPELIB_ENABLED
diff --git a/shape.h b/shape.h
index 0ce05af7..0b76bb2a 100644
--- a/shape.h
+++ b/shape.h
@@ -27,7 +27,7 @@
 
 #include "defs.h"               // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
 #include "format.h"             // for Format
-#include "shapelib/shapefil.h"  // for DBFHandle, SHPAPI_CALL, SHPHandle
+#include <shapefil.h>  // for DBFHandle, SHPAPI_CALL, SHPHandle
 
 
 #if SHAPELIB_ENABLED