diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py
index 7cb1addc15..bea24b9d41 100644
--- a/makepanda/installpanda.py
+++ b/makepanda/installpanda.py
@@ -32,6 +32,9 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
     oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages")
     oscmd("mkdir -p "+destdir+prefix+"/share/application-registry")
     oscmd("mkdir -p "+destdir+prefix+"/share/applications")
+    oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla/plugins")
+    oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla-firefox/plugins")
+    oscmd("mkdir -p "+destdir+prefix+"/lib/xulrunner-addons/plugins")
     oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
     oscmd("mkdir -p "+destdir+PPATH)
     oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d")
@@ -51,6 +54,10 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
     oscmd("cp makepanda/panda3d.applications    "+destdir+prefix+"/share/application-registry/panda3d.applications")
     oscmd("cp makepanda/panda3d.desktop         "+destdir+prefix+"/share/applications/panda3d.desktop")
     oscmd("cp makepanda/pview.desktop           "+destdir+prefix+"/share/applications/pview.desktop")
+    if (os.path.exists(outputdir+"/lib/nppanda3d.so")):
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla-firefox/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/xulrunner-addons/plugins/nppanda3d.so")
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/share/panda3d/LICENSE")
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/include/panda3d/LICENSE")
     oscmd("cp doc/ReleaseNotes                  "+destdir+prefix+"/share/panda3d/ReleaseNotes")
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 0b38bd7d98..b2941c4afe 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -378,7 +378,6 @@ if (COMPILER=="LINUX"):
           IncDirectory("FREETYPE", "/usr/X11/include/freetype2")
         IncDirectory("GLUT", "/usr/X11R6/include")
         if (PkgSkip("PNG")==0):        LibName("PNG", "-lpng")
-        if (PkgSkip("OPENSSL")==0):    LibName("OPENSSL",  "-lssl")
         if (PkgSkip("FREETYPE")==0):   LibName("FREETYPE", "-lfreetype")
     elif (LocateBinary("pkg-config")):
         PkgConfigEnable("GTK2", "gtk+-2.0")
@@ -389,6 +388,7 @@ if (COMPILER=="LINUX"):
     
     if (platform.uname()[1]=="pcbsd"):
         IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
+        LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
      
     if (os.path.exists("/usr/lib64")):
         IncDirectory("GTK2", "/usr/lib64/glib-2.0/include")
@@ -440,6 +440,7 @@ if (COMPILER=="LINUX"):
     if (PkgSkip("FFMPEG")==0):     LibName("FFMPEG", "-lavformat")
     if (PkgSkip("FFMPEG")==0):     LibName("FFMPEG", "-lavutil")
     if (PkgSkip("FFMPEG")==0):     LibName("FFMPEG", "-lswscale")
+    if (PkgSkip("OPENSSL")==0):    LibName("OPENSSL", "-lssl")
     if (PkgSkip("ZLIB")==0):       LibName("ZLIB", "-lz")
     if (PkgSkip("JPEG")==0):       LibName("JPEG", "-ljpeg")
     if (PkgSkip("VRPN")==0):       LibName("VRPN", "-lvrpn")
diff --git a/makepanda/pview.desktop b/makepanda/pview.desktop
new file mode 100644
index 0000000000..14609243be
--- /dev/null
+++ b/makepanda/pview.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Panda3D Model Viewer
+GenericName=Model Viewer
+Comment=View Panda3D model files
+TryExec=pview
+Exec=pview %U
+StartupNotify=true
+NoDisplay=true
+Terminal=true
+Type=Application
+Categories=Viewer;
+MimeType=model/x-egg;model/x-compressed-egg;model/x-bam;model/x-compressed-bam;