diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 336ec89dc4..48803a2d80 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -427,6 +427,8 @@ namespace MWBase
                                            const MWWorld::Ptr& actor, const std::string& sourceName) = 0;
 
             virtual void breakInvisibility (const MWWorld::Ptr& actor) = 0;
+
+            virtual bool isNight() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 1990292a78..1aa9ce9f5d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -440,15 +440,48 @@ namespace MWMechanics
 
     void Actors::updateEquippedLight (const MWWorld::Ptr& ptr, float duration)
     {
-        //If holding a light...
+        bool isPlayer = ptr.getRefData().getHandle()=="player";
+
         MWWorld::InventoryStore &inventoryStore = MWWorld::Class::get(ptr).getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator heldIter =
                 inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
+        /**
+         * Automatically equip NPCs torches at night and unequip them at day
+         */
+        if (!isPlayer && !MWWorld::Class::get (ptr).getCreatureStats (ptr).isHostile())
+        {
+          if (mTorchPtr.isEmpty())
+          {
+            mTorchPtr = inventoryStore.search("torch_infinite_time");
+          }
 
+          if (MWBase::Environment::get().getWorld()->isNight())
+          {
+            if (heldIter != inventoryStore.end() && heldIter->getTypeName() != typeid(ESM::Light).name())
+            {
+              inventoryStore.unequipItem(*heldIter, ptr);
+            }
+            else if (heldIter == inventoryStore.end() && !mTorchPtr.isEmpty())
+            {
+              heldIter = inventoryStore.add(mTorchPtr, ptr);
+              inventoryStore.equip(MWWorld::InventoryStore::Slot_CarriedLeft, heldIter, ptr);
+            }
+          }
+          else
+          {
+            if (heldIter != inventoryStore.end() && heldIter->getTypeName() == typeid(ESM::Light).name())
+            {
+              inventoryStore.unequipItem(*heldIter, ptr);
+              inventoryStore.add(*heldIter, ptr);
+              inventoryStore.autoEquip(ptr);
+            }
+          }
+        }
+
+        //If holding a light...
         if(heldIter.getType() == MWWorld::ContainerStore::Type_Light)
         {
             // Use time from the player's light
-            bool isPlayer = ptr.getRefData().getHandle()=="player";
             if(isPlayer)
             {
                 float timeRemaining = heldIter->getClass().getRemainingUsageTime(*heldIter);
diff --git a/apps/openmw/mwmechanics/actors.hpp b/apps/openmw/mwmechanics/actors.hpp
index 6afdefdbdc..411ac54ca8 100644
--- a/apps/openmw/mwmechanics/actors.hpp
+++ b/apps/openmw/mwmechanics/actors.hpp
@@ -25,14 +25,13 @@ namespace MWMechanics
 {
     class Actors
     {
-        typedef std::map<MWWorld::Ptr,CharacterController*> PtrControllerMap;
-        PtrControllerMap mActors;
-
-        std::map<std::string, int> mDeathCount;
-
-        void updateNpc(const MWWorld::Ptr &ptr, float duration, bool paused);
+            typedef std::map<MWWorld::Ptr,CharacterController*> PtrControllerMap;
+            PtrControllerMap mActors;
 
+            std::map<std::string, int> mDeathCount;
+            MWWorld::Ptr mTorchPtr;
 
+            void updateNpc(const MWWorld::Ptr &ptr, float duration, bool paused);
 
             void adjustMagicEffects (const MWWorld::Ptr& creature);
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2b93225e41..17eff3d022 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -36,6 +36,8 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
+#include "../mwworld/actionequip.hpp"
+#include "../mwworld/actiontake.hpp"
 
 namespace
 {
@@ -717,18 +719,18 @@ bool CharacterController::updateNpcState(bool onground, bool inwater, bool isrun
         }
     }
 
-
     MWWorld::ContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
     if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name()
             && mWeaponType != WeapType_Spell && mWeaponType != WeapType_HandToHand)
+
     {
-        if(!mAnimation->isPlaying("torch"))
-            mAnimation->play("torch", Priority_Torch,
-                             MWRender::Animation::Group_LeftArm, false,
-                             1.0f, "start", "stop", 0.0f, (~(size_t)0));
+      mAnimation->play("torch", Priority_Torch, MWRender::Animation::Group_LeftArm,
+        false, 1.0f, "start", "stop", 0.0f, (~(size_t)0));
+    }
+    else if (mAnimation->isPlaying("torch"))
+    {
+      mAnimation->disable("torch");
     }
-    else if(mAnimation->isPlaying("torch"))
-        mAnimation->disable("torch");
 
     return forcestateupdate;
 }
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 9fd329b2c3..849e9ff26c 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -175,6 +175,13 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
     for (ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
     {
         Ptr test = *iter;
+
+        // Don't autoEquip lights
+        if (test.getTypeName() == typeid(ESM::Light).name())
+        {
+          continue;
+        }
+
         int testSkill = MWWorld::Class::get (test).getEquipmentSkill (test);
 
         std::pair<std::vector<int>, bool> itemsSlots =
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 8b05d2256a..c355d86a8a 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -707,3 +707,8 @@ float WeatherManager::getWindSpeed() const
 {
     return mWindSpeed;
 }
+
+bool WeatherManager::isNight() const
+{
+  return (mHour < mSunriseTime || mHour > mNightStart - 1);
+}
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 80cbe0418e..4c412c4498 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -152,6 +152,8 @@ namespace MWWorld
 
         void modRegion(const std::string &regionid, const std::vector<char> &chances);
 
+        bool isNight() const;
+
     private:
         float mHour;
         int mDay, mMonth;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bc60ea8be9..cf32217b62 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2285,4 +2285,9 @@ namespace MWWorld
         actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect(ESM::MagicEffect::Invisibility);
         actor.getClass().getInventoryStore(actor).purgeEffect(ESM::MagicEffect::Invisibility);
     }
+
+    bool World::isNight() const
+    {
+      return mWeatherManager->isNight();
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 998d393175..2c2f096ee3 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -516,6 +516,7 @@ namespace MWWorld
                                            const MWWorld::Ptr& actor, const std::string& sourceName);
 
             virtual void breakInvisibility (const MWWorld::Ptr& actor);
+            virtual bool isNight() const;
     };
 }