diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index af4cb2dca5..69b4265801 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -864,7 +864,7 @@ if (COMPILER=="GCC"):
         if not PkgSkip("NVIDIACG") and not RUNTIME:
             SmartPkgEnable("CGGL", "", ("CgGL"), "Cg/cgGL.h", thirdparty_dir = "nvidiacg")
         if not RUNTIME:
-            SmartPkgEnable("X11", "x11", "X11", ("X11", "X11/Xlib.h"))
+            SmartPkgEnable("X11", "x11", "X11", ("X11", "X11/Xlib.h", "X11/XKBlib.h"))
 
     if GetHost() != "darwin":
         # Workaround for an issue where pkg-config does not include this path
@@ -7216,8 +7216,8 @@ def MakeInstallerFreeBSD():
             plist_txt += os.path.join(root, f)[21:] + "\n"
 
     if not RUNTIME:
-        plist_txt += "@exec /sbin/ldconfig -m /usr/local/lib\n"
-        plist_txt += "@unexec /sbin/ldconfig -R\n"
+        plist_txt += "@postexec /sbin/ldconfig -m /usr/local/lib\n"
+        plist_txt += "@postunexec /sbin/ldconfig -R\n"
 
         for remdir in ("lib/panda3d", "share/panda3d", "include/panda3d"):
             for root, dirs, files in os.walk("targetroot/usr/local/" + remdir, False):
diff --git a/panda/src/display/get_x11.h b/panda/src/display/get_x11.h
index f9112766d7..57ca5cf44e 100644
--- a/panda/src/display/get_x11.h
+++ b/panda/src/display/get_x11.h
@@ -45,6 +45,7 @@ struct XVisualInfo;
 #else
 
 #include "pre_x11_include.h"
+#include <X11/XKBlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
diff --git a/panda/src/egg/eggLine.h b/panda/src/egg/eggLine.h
index 059dfa7648..72ea411cdc 100644
--- a/panda/src/egg/eggLine.h
+++ b/panda/src/egg/eggLine.h
@@ -31,7 +31,7 @@ PUBLISHED:
 
   virtual EggLine *make_copy() const OVERRIDE;
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
   INLINE bool has_thick() const;
   INLINE double get_thick() const;
@@ -39,7 +39,7 @@ PUBLISHED:
   INLINE void clear_thick();
 
 protected:
-  virtual int get_num_lead_vertices() const;
+  virtual int get_num_lead_vertices() const OVERRIDE;
 
 private:
   double _thick;
@@ -54,10 +54,13 @@ public:
     register_type(_type_handle, "EggLine",
                   EggCompositePrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggNurbsCurve.h b/panda/src/egg/eggNurbsCurve.h
index 9797a12ea8..4225549736 100644
--- a/panda/src/egg/eggNurbsCurve.h
+++ b/panda/src/egg/eggNurbsCurve.h
@@ -50,7 +50,7 @@ PUBLISHED:
   INLINE double get_knot(int k) const;
   MAKE_SEQ(get_knots, get_num_knots, get_knot);
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
   MAKE_PROPERTY(order, get_order, set_order);
   MAKE_PROPERTY(degree, get_degree);
@@ -72,10 +72,13 @@ public:
     register_type(_type_handle, "EggNurbsCurve",
                   EggCurve::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggNurbsSurface.h b/panda/src/egg/eggNurbsSurface.h
index 8e09d43fbd..83900282f0 100644
--- a/panda/src/egg/eggNurbsSurface.h
+++ b/panda/src/egg/eggNurbsSurface.h
@@ -75,14 +75,14 @@ PUBLISHED:
   MAKE_SEQ(get_v_knots, get_num_v_knots, get_v_knot);
   INLINE EggVertex *get_cv(int ui, int vi) const;
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
 public:
   Curves _curves_on_surface;
   Trims _trims;
 
 protected:
-  virtual void r_apply_texmats(EggTextureCollection &textures);
+  virtual void r_apply_texmats(EggTextureCollection &textures) OVERRIDE;
 
 private:
   typedef vector_double Knots;
@@ -101,10 +101,13 @@ public:
     register_type(_type_handle, "EggNurbsSurface",
                   EggSurface::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggPatch.h b/panda/src/egg/eggPatch.h
index 63cfc61353..4358149131 100644
--- a/panda/src/egg/eggPatch.h
+++ b/panda/src/egg/eggPatch.h
@@ -30,7 +30,7 @@ PUBLISHED:
 
   virtual EggPatch *make_copy() const OVERRIDE;
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
 public:
   static TypeHandle get_class_type() {
@@ -41,10 +41,13 @@ public:
     register_type(_type_handle, "EggPatch",
                   EggPrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggPoint.h b/panda/src/egg/eggPoint.h
index ae7d7e1d34..93ed683133 100644
--- a/panda/src/egg/eggPoint.h
+++ b/panda/src/egg/eggPoint.h
@@ -40,9 +40,9 @@ PUBLISHED:
   INLINE void set_perspective(bool perspective);
   INLINE void clear_perspective();
 
-  virtual bool cleanup();
+  virtual bool cleanup() OVERRIDE;
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
 private:
   enum Flags {
@@ -64,10 +64,13 @@ public:
     register_type(_type_handle, "EggPoint",
                   EggPrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggPolygon.h b/panda/src/egg/eggPolygon.h
index a549af3bf7..5d25c554be 100644
--- a/panda/src/egg/eggPolygon.h
+++ b/panda/src/egg/eggPolygon.h
@@ -29,7 +29,7 @@ PUBLISHED:
 
   virtual EggPolygon *make_copy() const OVERRIDE;
 
-  virtual bool cleanup();
+  virtual bool cleanup() OVERRIDE;
 
   bool calculate_normal(LNormald &result, CoordinateSystem cs = CS_default) const;
   bool is_planar() const;
@@ -39,7 +39,7 @@ PUBLISHED:
   INLINE bool triangulate_into(EggGroupNode *container, bool convex_also) const;
   PT(EggPolygon) triangulate_in_place(bool convex_also);
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
 private:
   bool decomp_concave(EggGroupNode *container, int asum, int x, int y) const;
@@ -55,10 +55,13 @@ public:
     register_type(_type_handle, "EggPolygon",
                   EggPrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggTriangleFan.h b/panda/src/egg/eggTriangleFan.h
index 0a5e3f1e35..f2ca8e32b5 100644
--- a/panda/src/egg/eggTriangleFan.h
+++ b/panda/src/egg/eggTriangleFan.h
@@ -31,12 +31,12 @@ PUBLISHED:
 
   virtual EggTriangleFan *make_copy() const OVERRIDE;
 
-  virtual void write(ostream &out, int indent_level) const;
-  virtual void apply_first_attribute();
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
+  virtual void apply_first_attribute() OVERRIDE;
 
 protected:
-  virtual int get_num_lead_vertices() const;
-  virtual bool do_triangulate(EggGroupNode *container) const;
+  virtual int get_num_lead_vertices() const OVERRIDE;
+  virtual bool do_triangulate(EggGroupNode *container) const OVERRIDE;
 
 public:
   static TypeHandle get_class_type() {
@@ -47,10 +47,13 @@ public:
     register_type(_type_handle, "EggTriangleFan",
                   EggCompositePrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/egg/eggTriangleStrip.h b/panda/src/egg/eggTriangleStrip.h
index 202172d1cd..a84d0cd751 100644
--- a/panda/src/egg/eggTriangleStrip.h
+++ b/panda/src/egg/eggTriangleStrip.h
@@ -31,11 +31,11 @@ PUBLISHED:
 
   virtual EggTriangleStrip *make_copy() const OVERRIDE;
 
-  virtual void write(ostream &out, int indent_level) const;
+  virtual void write(ostream &out, int indent_level) const OVERRIDE;
 
 protected:
-  virtual int get_num_lead_vertices() const;
-  virtual bool do_triangulate(EggGroupNode *container) const;
+  virtual int get_num_lead_vertices() const OVERRIDE;
+  virtual bool do_triangulate(EggGroupNode *container) const OVERRIDE;
 
 public:
   static TypeHandle get_class_type() {
@@ -46,10 +46,13 @@ public:
     register_type(_type_handle, "EggTriangleStrip",
                   EggCompositePrimitive::get_class_type());
   }
-  virtual TypeHandle get_type() const {
+  virtual TypeHandle get_type() const OVERRIDE {
+    return get_class_type();
+  }
+  virtual TypeHandle force_init_type() OVERRIDE {
+    init_type();
     return get_class_type();
   }
-  virtual TypeHandle force_init_type() {init_type(); return get_class_type();}
 
 private:
   static TypeHandle _type_handle;
diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx
index 3ea2cd3fb0..17a8121efc 100644
--- a/panda/src/x11display/x11GraphicsWindow.cxx
+++ b/panda/src/x11display/x11GraphicsWindow.cxx
@@ -2051,7 +2051,7 @@ get_keyboard_map() const {
       continue;
     }
 
-    KeySym sym = XKeycodeToKeysym(_display, k, 0);
+    KeySym sym = XkbKeycodeToKeysym(_display, k, 0, 0);
     ButtonHandle button = map_button(sym);
     if (button == ButtonHandle::none()) {
       continue;