diff -ruN OpenBoard-1.5.4-orig/OpenBoard.pro OpenBoard-1.5.4/OpenBoard.pro
--- OpenBoard-1.5.4-orig/OpenBoard.pro	2020-01-23 11:29:35.000000000 +0100
+++ OpenBoard-1.5.4/OpenBoard.pro	2020-05-05 19:22:24.000000000 +0200
@@ -98,6 +98,11 @@
 count(ALPHA_BETA_STR, 1):DEFINES += PRE_RELEASE
 BUILD_DIR = build
 
+OB_INAWINDOW = $$(OB_INAWINDOW)
+!isEmpty(OB_INAWINDOW) {
+	DEFINES += OB_INAWINDOW
+}
+
 macx:BUILD_DIR = $$BUILD_DIR/macx
 win32:BUILD_DIR = $$BUILD_DIR/win32
 linux-g++*:BUILD_DIR = $$BUILD_DIR/linux
@@ -432,6 +437,8 @@
     QMAKE_CFLAGS += -fopenmp
     QMAKE_CXXFLAGS += -fopenmp
     QMAKE_LFLAGS += -fopenmp
+	# Necessary for CentOS/RHEL and won't harm in other distributions
+    INCLUDEPATH += /usr/include/ffmpeg
     UB_LIBRARY.path = $$DESTDIR
     UB_I18N.path = $$DESTDIR/i18n
     UB_ETC.path = $$DESTDIR
diff -ruN OpenBoard-1.5.4-orig/README-OB-IN-A-WINDOW.txt OpenBoard-1.5.4/README-OB-IN-A-WINDOW.txt
--- OpenBoard-1.5.4-orig/README-OB-IN-A-WINDOW.txt	1970-01-01 01:00:00.000000000 +0100
+++ OpenBoard-1.5.4/README-OB-IN-A-WINDOW.txt	2020-05-01 11:49:20.978001634 +0200
@@ -0,0 +1,12 @@
+
+In order to compile a version of openboard which runs in it's own
+window instead of fullscreen, you should set the environment
+variable OB_INAWINDOW to yes before running qmake.
+
+For instance:
+env OB_INAWINDOW=yes qmake-qt5 OpenBoard.pro -spec linux-g++-64
+
+spd@daphne.cps.unizar.es
+https://webdiis.unizar.es/~spd/openboard
+
+
diff -ruN OpenBoard-1.5.4-orig/src/core/UBApplication.cpp OpenBoard-1.5.4/src/core/UBApplication.cpp
--- OpenBoard-1.5.4-orig/src/core/UBApplication.cpp	2020-01-23 11:29:35.000000000 +0100
+++ OpenBoard-1.5.4/src/core/UBApplication.cpp	2020-05-05 19:48:06.000000000 +0200
@@ -278,7 +278,17 @@
     gs->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
 
 
+#ifdef OB_INAWINDOW
+    mainWindow = new UBMainWindow(0,
+		Qt::Window |
+		Qt::WindowCloseButtonHint |
+		Qt::WindowMinimizeButtonHint |
+		Qt::WindowMaximizeButtonHint |
+		Qt::WindowShadeButtonHint
+	); // deleted by application destructor
+#else
     mainWindow = new UBMainWindow(0, Qt::FramelessWindowHint); // deleted by application destructor
+#endif
     mainWindow->setAttribute(Qt::WA_NativeWindow, true);
 
     mainWindow->actionCopy->setShortcuts(QKeySequence::Copy);
diff -ruN OpenBoard-1.5.4-orig/src/frameworks/UBPlatformUtils_linux.cpp OpenBoard-1.5.4/src/frameworks/UBPlatformUtils_linux.cpp
--- OpenBoard-1.5.4-orig/src/frameworks/UBPlatformUtils_linux.cpp	2020-01-23 11:29:35.000000000 +0100
+++ OpenBoard-1.5.4/src/frameworks/UBPlatformUtils_linux.cpp	2020-05-05 19:16:00.000000000 +0200
@@ -439,7 +439,11 @@
 
 void UBPlatformUtils::showFullScreen(QWidget *pWidget)
 {
-    pWidget->showFullScreen();
+#ifdef OB_INAWINDOW
+	pWidget->showNormal();
+#else
+	pWidget->showFullScreen();
+#endif
 }
 
 void UBPlatformUtils::showOSK(bool show)
diff -ruN OpenBoard-1.5.4-orig/src/frameworks/UBPlatformUtils_win.cpp OpenBoard-1.5.4/src/frameworks/UBPlatformUtils_win.cpp
--- OpenBoard-1.5.4-orig/src/frameworks/UBPlatformUtils_win.cpp	2020-01-23 11:29:35.000000000 +0100
+++ OpenBoard-1.5.4/src/frameworks/UBPlatformUtils_win.cpp	2020-05-05 18:27:58.000000000 +0200
@@ -436,7 +436,11 @@
 
 void UBPlatformUtils::showFullScreen(QWidget *pWidget)
 {
+#ifdef OB_INAWINDOW
+	pWidget->showNormal();
+#else
     pWidget->showFullScreen();
+#endif
 }
 
 void UBPlatformUtils::showOSK(bool show)