diff --git a/doomsday/client/src/render/rendersystem.cpp b/doomsday/client/src/render/rendersystem.cpp
index 75bebab603..72a70776b8 100644
--- a/doomsday/client/src/render/rendersystem.cpp
+++ b/doomsday/client/src/render/rendersystem.cpp
@@ -213,12 +213,15 @@ DENG2_PIMPL(RenderSystem)
     /**
      * Reads all shader definitions and sets up a Bank where the actual
      * compiled shaders are stored once they're needed.
+     *
+     * @todo This should be reworked to support unloading packages, and
+     * loading of new shaders from any newly loaded packages. -jk
      */
     void loadAllShaders()
     {
         // Load all the shader program definitions.
         FS::FoundFiles found;
-        App::fileSystem().findAll("shaders.dei", found);
+        App::fileSystem().nameIndex().findPartialPathInPackageOrder("shaders.dei", found);
         DENG2_FOR_EACH(FS::FoundFiles, i, found)
         {
             LOG_MSG("Loading shader definitions from %s") << (*i)->description();