diff -Naur a/Makefile b/Makefile
--- a/Makefile	2011-10-25 17:27:00.000000000 +0200
+++ b/Makefile	2020-07-31 13:30:20.989919362 +0200
@@ -66,7 +66,7 @@
         \) -exec install -D {} $(DESTDIR)$(DATADIR)/{} \;
 
 install-man:
-	install -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man1/pingus.6"
+	install -D doc/man/pingus.6 "$(DESTDIR)$(MANDIR)/man6/pingus.6"
 
 .PHONY : clean install install-exec install-data install-man
 
diff -Naur a/SConscript b/SConscript
--- a/SConscript	2011-10-25 17:27:00.000000000 +0200
+++ b/SConscript	2020-07-31 13:36:59.696584164 +0200
@@ -126,12 +126,12 @@
     def configure_end(self):
         self.env = self.conf.Finish()
 
-        print "Reports:"
-        print self.reports
+        print ("Reports:")
+        print (self.reports)
 
         if not self.fatal_error == "":
-            print "Fatal Errors:"
-            print self.fatal_error
+            print ("Fatal Errors:")
+            print (self.fatal_error)
             Exit(1)
 
     def configure_gxx(self): 
@@ -187,9 +187,8 @@
                                                      'src/engine/input/xinput/xinput_device.cpp'])
             
     def configure_boost(self):
-        if not self.conf.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'):
-            if not self.conf.CheckLibWithHeader('boost_signals-mt', 'boost/signals.hpp', 'c++'):
-                self.fatal_error += "  * library 'boost_signals' not found\n"
+        if not self.conf.CheckHeader('boost/signals2.hpp', '<>', 'c++'):
+            self.fatal_error += "  * library 'boost_signals2' not found\n"
 
     def configure_png(self):
         if self.conf.CheckMyProgram('pkg-config'):
diff -Naur a/src/editor/button.hpp b/src/editor/button.hpp
--- a/src/editor/button.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/button.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP
 #define HEADER_PINGUS_EDITOR_BUTTON_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/gui/rect_component.hpp"
 
@@ -48,7 +48,7 @@
   void enable()  { enabled = true; }
   void disable() { enabled = false; }
 
-  boost::signal<void()> on_click;
+  boost::signals2::signal<void()> on_click;
 
 private:
   Button (const Button&);
diff -Naur a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp
--- a/src/editor/checkbox.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/checkbox.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP
 #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/gui/rect_component.hpp"
 
@@ -40,7 +40,7 @@
   bool is_checked() const { return checked; }
   void on_primary_button_press(int x, int y);
 
-  boost::signal<void (bool)> on_change;
+  boost::signals2::signal<void (bool)> on_change;
  
 private:
   Checkbox (const Checkbox&);
diff -Naur a/src/editor/combobox.hpp b/src/editor/combobox.hpp
--- a/src/editor/combobox.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/combobox.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -18,7 +18,7 @@
 #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP
 #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/display/sprite.hpp"
 #include "engine/gui/rect_component.hpp"
@@ -88,7 +88,7 @@
   
   void update_layout() {}
   
-  boost::signal<void (const ComboItem&)> on_select;
+  boost::signals2::signal<void (const ComboItem&)> on_select;
 
 private:
   Combobox();
diff -Naur a/src/editor/file_list.hpp b/src/editor/file_list.hpp
--- a/src/editor/file_list.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/file_list.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP
 #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/display/sprite.hpp"
 #include "engine/gui/rect_component.hpp"
@@ -61,7 +61,7 @@
   bool has_more_next_pages();
   bool has_more_prev_pages();
 
-  boost::signal<void (const System::DirectoryEntry&)> on_click;
+  boost::signals2::signal<void (const System::DirectoryEntry&)> on_click;
 
 private:
   int items_per_page();
diff -Naur a/src/editor/inputbox.hpp b/src/editor/inputbox.hpp
--- a/src/editor/inputbox.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/inputbox.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP
 #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/gui/rect_component.hpp"
 
@@ -40,8 +40,8 @@
 
   void update_layout() {}
 
-  boost::signal<void (const std::string&)> on_change;
-  boost::signal<void (const std::string&)> on_enter;
+  boost::signals2::signal<void (const std::string&)> on_change;
+  boost::signals2::signal<void (const std::string&)> on_enter;
 
 private:
   Inputbox (const Inputbox&);
diff -Naur a/src/editor/message_box.hpp b/src/editor/message_box.hpp
--- a/src/editor/message_box.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/message_box.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -45,7 +45,7 @@
   void on_cancel_button();
 
 public:
-  boost::signal<void()> on_ok;
+  boost::signals2::signal<void()> on_ok;
 
 private:
   MessageBox(const MessageBox&);
diff -Naur a/src/editor/object_selector.cpp b/src/editor/object_selector.cpp
--- a/src/editor/object_selector.cpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/object_selector.cpp	2020-07-31 13:36:59.696584164 +0200
@@ -16,7 +16,7 @@
 
 #include "editor/object_selector.hpp"
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "editor/generic_level_obj.hpp"
 #include "editor/gui_style.hpp"
@@ -47,7 +47,7 @@
   std::string tooltip;
   
 public:
-  boost::signal<void()> on_click;
+  boost::signals2::signal<void()> on_click;
 
 public:
   ObjectSelectorButton(ObjectSelectorList* object_list_,
diff -Naur a/src/editor/viewport.hpp b/src/editor/viewport.hpp
--- a/src/editor/viewport.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/editor/viewport.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -18,7 +18,7 @@
 #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
 #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 #include <set>
 
 #include "editor/selection.hpp"
@@ -148,7 +148,7 @@
 
   void clear_selection();
 
-  boost::signal<void (const Selection&)> selection_changed;
+  boost::signals2::signal<void (const Selection&)> selection_changed;
 private:
   Viewport();
   Viewport (const Viewport&);
diff -Naur a/src/pingus/components/check_box.hpp b/src/pingus/components/check_box.hpp
--- a/src/pingus/components/check_box.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/components/check_box.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
 #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/display/sprite.hpp"
 #include "engine/gui/rect_component.hpp"
@@ -39,7 +39,7 @@
 
   void set_state(bool v, bool send_signal);
 
-  boost::signal<void (bool)> on_change;
+  boost::signals2::signal<void (bool)> on_change;
 
 private:
   CheckBox (const CheckBox&);
diff -Naur a/src/pingus/components/choice_box.hpp b/src/pingus/components/choice_box.hpp
--- a/src/pingus/components/choice_box.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/components/choice_box.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
 #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/gui/rect_component.hpp"
 
@@ -36,7 +36,7 @@
   void add_choice(const std::string& str);
   void set_current_choice(int choice);
   
-  boost::signal<void (std::string)> on_change;
+  boost::signals2::signal<void (std::string)> on_change;
   
 private:
   ChoiceBox (const ChoiceBox&);
diff -Naur a/src/pingus/components/slider_box.hpp b/src/pingus/components/slider_box.hpp
--- a/src/pingus/components/slider_box.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/components/slider_box.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
 #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "engine/gui/rect_component.hpp"
 
@@ -39,7 +39,7 @@
 
   void set_value(int v);
 
-  boost::signal<void (int)> on_change;
+  boost::signals2::signal<void (int)> on_change;
 
 private:
   SliderBox (const SliderBox&);
diff -Naur a/src/pingus/config_manager.hpp b/src/pingus/config_manager.hpp
--- a/src/pingus/config_manager.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/config_manager.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
 #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include "math/size.hpp"
 #include "pingus/options.hpp"
@@ -39,55 +39,55 @@
 
   void set_master_volume(int);
   int  get_master_volume() const;
-  boost::signal<void(int)> on_master_volume_change;
+  boost::signals2::signal<void(int)> on_master_volume_change;
 
   void set_sound_volume(int);
   int  get_sound_volume() const;
-  boost::signal<void(int)> on_sound_volume_change;
+  boost::signals2::signal<void(int)> on_sound_volume_change;
 
   void set_music_volume(int);
   int  get_music_volume() const;
-  boost::signal<void(int)> on_music_volume_change;
+  boost::signals2::signal<void(int)> on_music_volume_change;
 
   void set_fullscreen_resolution(const Size& size);
   Size get_fullscreen_resolution() const;
-  boost::signal<void(Size)> on_fullscreen_resolution_change;
+  boost::signals2::signal<void(Size)> on_fullscreen_resolution_change;
 
   void set_fullscreen(bool);
   bool get_fullscreen() const;
-  boost::signal<void(bool)> on_fullscreen_change;
+  boost::signals2::signal<void(bool)> on_fullscreen_change;
 
   void set_renderer(FramebufferType type);
   FramebufferType get_renderer() const;
-  boost::signal<void(FramebufferType)> on_renderer_change;
+  boost::signals2::signal<void(FramebufferType)> on_renderer_change;
 
   void set_resizable(bool);
   bool get_resizable() const;
-  boost::signal<void(bool)> on_resizable_change;
+  boost::signals2::signal<void(bool)> on_resizable_change;
 
   void set_mouse_grab(bool);
   bool get_mouse_grab() const;
-  boost::signal<void(bool)> on_mouse_grab_change;
+  boost::signals2::signal<void(bool)> on_mouse_grab_change;
 
   void set_print_fps(bool);
   bool get_print_fps() const;
-  boost::signal<void(bool)> on_print_fps_change;
+  boost::signals2::signal<void(bool)> on_print_fps_change;
 
   void set_language(const tinygettext::Language&);
   tinygettext::Language get_language() const;
-  boost::signal<void(const tinygettext::Language&)> on_language_change;
+  boost::signals2::signal<void(const tinygettext::Language&)> on_language_change;
 
   void set_software_cursor(bool);
   bool get_software_cursor() const;
-  boost::signal<void(bool)> on_software_cursor_change;
+  boost::signals2::signal<void(bool)> on_software_cursor_change;
 
   void set_auto_scrolling(bool);
   bool get_auto_scrolling() const;
-  boost::signal<void(bool)> on_auto_scrolling_change;
+  boost::signals2::signal<void(bool)> on_auto_scrolling_change;
 
   void set_drag_drop_scrolling(bool);
   bool get_drag_drop_scrolling() const;
-  boost::signal<void(bool)> on_drag_drop_scrolling_change;
+  boost::signals2::signal<void(bool)> on_drag_drop_scrolling_change;
 
 private:
   ConfigManager (const ConfigManager&);
diff -Naur a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
--- a/src/pingus/screens/demo_session.cpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/screens/demo_session.cpp	2020-07-31 13:29:10.493253027 +0200
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <functional>
 
 #include "engine/gui/gui_manager.hpp"
 #include "engine/gui/surface_button.hpp"
diff -Naur a/src/pingus/screens/option_menu.hpp b/src/pingus/screens/option_menu.hpp
--- a/src/pingus/screens/option_menu.hpp	2011-10-25 17:27:00.000000000 +0200
+++ b/src/pingus/screens/option_menu.hpp	2020-07-31 13:36:59.696584164 +0200
@@ -17,7 +17,7 @@
 #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
 #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP
 
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
 #include <map>
 #include <vector>
 
@@ -66,7 +66,7 @@
   //Label* defaults_label;
   //CheckBox* defaults_box;
 
-  typedef std::vector<boost::signals::connection> Connections;
+  typedef std::vector<boost::signals2::connection> Connections;
   Connections connections;
 
   tinygettext::Language m_language;