diff --git a/emulators/dynagen/pkg-plist b/emulators/dynagen/pkg-plist
index 9c3ddf16561a..cfc8517357ee 100644
--- a/emulators/dynagen/pkg-plist
+++ b/emulators/dynagen/pkg-plist
@@ -2,30 +2,30 @@ bin/dynagen
 @unexec if cmp -s %D/etc/dynagen.ini.sample %D/etc/dynagen.ini; then rm -f %D/etc/dynagen.ini; fi
 etc/dynagen.ini.sample
 @exec if [ ! -f %D/etc/dynagen.ini ] ; then cp -p %D/%F %B/dynagen.ini; fi
-lib/%%PYTHON_VERSION%%/site-packages/confConsole.py
-lib/%%PYTHON_VERSION%%/site-packages/configobj.py
-lib/%%PYTHON_VERSION%%/site-packages/console.py
-lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.py
-lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.py
-lib/%%PYTHON_VERSION%%/site-packages/pemubin.py
-lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.py
-lib/%%PYTHON_VERSION%%/site-packages/validate.py
-lib/%%PYTHON_VERSION%%/site-packages/confConsole.pyc
-lib/%%PYTHON_VERSION%%/site-packages/configobj.pyc
-lib/%%PYTHON_VERSION%%/site-packages/console.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pemubin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.pyc
-lib/%%PYTHON_VERSION%%/site-packages/validate.pyc
-lib/%%PYTHON_VERSION%%/site-packages/confConsole.pyo
-lib/%%PYTHON_VERSION%%/site-packages/configobj.pyo
-lib/%%PYTHON_VERSION%%/site-packages/console.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynamips_lib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pemu_lib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pemubin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/pemuwrapper.pyo
-lib/%%PYTHON_VERSION%%/site-packages/validate.pyo
+%%PYTHON_SITELIBDIR%%/confConsole.py
+%%PYTHON_SITELIBDIR%%/configobj.py
+%%PYTHON_SITELIBDIR%%/console.py
+%%PYTHON_SITELIBDIR%%/dynamips_lib.py
+%%PYTHON_SITELIBDIR%%/pemu_lib.py
+%%PYTHON_SITELIBDIR%%/pemubin.py
+%%PYTHON_SITELIBDIR%%/pemuwrapper.py
+%%PYTHON_SITELIBDIR%%/validate.py
+%%PYTHON_SITELIBDIR%%/confConsole.pyc
+%%PYTHON_SITELIBDIR%%/configobj.pyc
+%%PYTHON_SITELIBDIR%%/console.pyc
+%%PYTHON_SITELIBDIR%%/dynamips_lib.pyc
+%%PYTHON_SITELIBDIR%%/pemu_lib.pyc
+%%PYTHON_SITELIBDIR%%/pemubin.pyc
+%%PYTHON_SITELIBDIR%%/pemuwrapper.pyc
+%%PYTHON_SITELIBDIR%%/validate.pyc
+%%PYTHON_SITELIBDIR%%/confConsole.pyo
+%%PYTHON_SITELIBDIR%%/configobj.pyo
+%%PYTHON_SITELIBDIR%%/console.pyo
+%%PYTHON_SITELIBDIR%%/dynamips_lib.pyo
+%%PYTHON_SITELIBDIR%%/pemu_lib.pyo
+%%PYTHON_SITELIBDIR%%/pemubin.pyo
+%%PYTHON_SITELIBDIR%%/pemuwrapper.pyo
+%%PYTHON_SITELIBDIR%%/validate.pyo
 %%EXAMPLESDIR%%/sample_labs/ethernet_switch/ethsw1.net
 %%EXAMPLESDIR%%/sample_labs/frame_relay/frame_relay1.net
 %%EXAMPLESDIR%%/sample_labs/multiserver/multiserver.net
diff --git a/emulators/dynagui/pkg-plist b/emulators/dynagui/pkg-plist
index 467c670cd278..ff6404ff0ded 100644
--- a/emulators/dynagui/pkg-plist
+++ b/emulators/dynagui/pkg-plist
@@ -1,65 +1,65 @@
 bin/dynagui.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/canvas.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_ethsw.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_router.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/frsw_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab_io.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c7200.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C3600_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/router_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/nvram_io.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/dynamips_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c3600.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/atmsw_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/util.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_atmsw.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_frsw.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/ethsw_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C7200_properties_dialog.py
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/canvas.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_ethsw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_router.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/frsw_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab_io.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c7200.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C3600_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/router_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/nvram_io.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/dynamips_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c3600.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/atmsw_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_atmsw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_frsw.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/ethsw_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C7200_properties_dialog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/canvas.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_ethsw.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_router.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/frsw_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab_io.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c7200.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C3600_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/router_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/nvram_io.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/lab.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/dynamips_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_c3600.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/atmsw_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/util.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_atmsw.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/gui_frsw.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/ethsw_properties_dialog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs/C7200_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui.py
+%%PYTHON_SITELIBDIR%%/dynagui.pyc
+%%PYTHON_SITELIBDIR%%/dynagui.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/__init__.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/canvas.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_ethsw.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_router.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/frsw_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab_io.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c7200.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C3600_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/router_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/nvram_io.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/dynamips_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c3600.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/atmsw_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/util.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_atmsw.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_frsw.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/ethsw_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C7200_properties_dialog.py
+%%PYTHON_SITELIBDIR%%/dynagui_libs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/canvas.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_ethsw.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_router.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/frsw_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab_io.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c7200.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C3600_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/router_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/nvram_io.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/dynamips_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c3600.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/atmsw_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/util.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_atmsw.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_frsw.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/ethsw_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C7200_properties_dialog.pyc
+%%PYTHON_SITELIBDIR%%/dynagui_libs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/canvas.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_ethsw.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_router.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/frsw_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab_io.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c7200.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C3600_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/router_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/nvram_io.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/lab.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/dynamips_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_c3600.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/atmsw_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/util.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_atmsw.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/gui_frsw.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/ethsw_properties_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dynagui_libs/C7200_properties_dialog.pyo
 %%DATADIR%%/img/chassis.png
 @dirrm %%DATADIR%%/img
 @dirrm %%DATADIR%%
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/dynagui_libs
+@dirrm %%PYTHON_SITELIBDIR%%/dynagui_libs