diff --git a/game/modules/tome/data/general/objects/lore/fun.lua b/game/modules/tome/data/general/objects/lore/fun.lua
new file mode 100644
index 0000000000000000000000000000000000000000..bef0d8c0959e44ed2d6d05f2f4d28d738a32fbcd
--- /dev/null
+++ b/game/modules/tome/data/general/objects/lore/fun.lua
@@ -0,0 +1,32 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newEntity{ base = "BASE_LORE",
+ name = "trollish poem, first part", lore="troll-poem-1", unique=true,
+ desc = [[A poem written by a ... troll?]],
+ rarity = 20,
+ encumberance = 0,
+}
+
+newEntity{ base = "BASE_LORE",
+ name = "trollish poem, second part", lore="troll-poem-2", unique=true,
+ desc = [[A poem written by a ... troll?]],
+ rarity = 20,
+ encumberance = 0,
+}
diff --git a/game/modules/tome/data/general/objects/lore/spellhunt.lua b/game/modules/tome/data/general/objects/lore/spellhunt.lua
index a26f9e55eace78c16c897a97b5ef5e2107e0de3b..ef9b822d55837c9d889dd31354f7e6027b108e24 100644
--- a/game/modules/tome/data/general/objects/lore/spellhunt.lua
+++ b/game/modules/tome/data/general/objects/lore/spellhunt.lua
@@ -17,7 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
name = "memories of archmage Varil", lore="spellhunt-note-1", unique=true,
desc = [[A collection of thoughts and memories of the archmage Varil, during the Age of Dusk]],
rarity = 20,
diff --git a/game/modules/tome/data/general/objects/lore/sunwall.lua b/game/modules/tome/data/general/objects/lore/sunwall.lua
index dcfc09ba4f5b8881ca2f4cc501000d1ea3e100f8..33d33b53f5dc7c854060ef512e4ec23c0d68a504 100644
--- a/game/modules/tome/data/general/objects/lore/sunwall.lua
+++ b/game/modules/tome/data/general/objects/lore/sunwall.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
for i = 1, 4 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "SUNWALL_LORE_NOTE"..i,
name = "Loremaster Verutir's note", lore="sunwall-note-"..i, unique="Loremaster Verutir's note "..i,
desc = [[A paper scrap containing some lore.]],
diff --git a/game/modules/tome/data/general/objects/objects.lua b/game/modules/tome/data/general/objects/objects.lua
index 77ac26570961cc9d7d1db7f97951543f0305d0fa..ccdc2ff49b6aea9135e97ecbe76adc2f47682163 100644
--- a/game/modules/tome/data/general/objects/objects.lua
+++ b/game/modules/tome/data/general/objects/objects.lua
@@ -81,6 +81,7 @@ loadIfNot("/data/general/objects/mounts.lua")
-- Lore
loadIfNot("/data/general/objects/lore/spellhunt.lua")
+loadIfNot("/data/general/objects/lore/fun.lua")
-- Artifacts
loadIfNot("/data/general/objects/world-artifacts.lua")
diff --git a/game/modules/tome/data/general/objects/scrolls.lua b/game/modules/tome/data/general/objects/scrolls.lua
index a898401353bcd3a369fe824c1df747def3397a4f..53150d05ddc7aac7480792b78c5cd3fc794784e0 100644
--- a/game/modules/tome/data/general/objects/scrolls.lua
+++ b/game/modules/tome/data/general/objects/scrolls.lua
@@ -34,6 +34,15 @@ newEntity{
egos = "/data/general/objects/egos/scrolls.lua", egos_chance = resolvers.mbonus(10, 5),
}
+newEntity{
+ define_as = "BASE_LORE",
+ type = "scroll", subtype="lore",
+ unided_name = "scroll", id_by_type = true,
+ display = "?", color=colors.ANTIQUE_WHITE, image="object/scroll-lore.png",
+ encumber = 0.1,
+ desc = [[This parchement contains some lore.]],
+}
+
newEntity{ base = "BASE_SCROLL",
name = "scroll of light",
level_range = {1, 40},
diff --git a/game/modules/tome/data/gfx/object/scroll-lore.png b/game/modules/tome/data/gfx/object/scroll-lore.png
new file mode 100644
index 0000000000000000000000000000000000000000..1976f4da164b49a8e7048b8b35365c2b254de9d6
Binary files /dev/null and b/game/modules/tome/data/gfx/object/scroll-lore.png differ
diff --git a/game/modules/tome/data/lore/fun.lua b/game/modules/tome/data/lore/fun.lua
new file mode 100644
index 0000000000000000000000000000000000000000..6d06af22c74e5c90c3f333516583a49686c0eb71
--- /dev/null
+++ b/game/modules/tome/data/lore/fun.lua
@@ -0,0 +1,66 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+--------------------------------------------------------------------------
+-- The Old Forest
+--------------------------------------------------------------------------
+
+newLore{
+ id = "troll-poem-1",
+ category = "misc",
+ name = "trollish poem (part one)",
+ lore = [[#{italic}#Club club club,
+Grab some grub!
+When hunger hits,
+Me likes to club!
+
+Little halfling,
+Furry feet,
+Smash his brains,
+Tasty meat!
+
+Skinny elf,
+Eyes so blue,
+Crush his bones,
+Make elf stew!
+
+...#{normal}#]],
+}
+
+newLore{
+ id = "troll-poem-2",
+ category = "misc",
+ name = "trollish poem (part two)",
+ lore = [[#{italic}#...
+
+Hairy dwarf,
+Smells like dirt,
+Cook him long,
+Or stomach hurt!
+
+Stupid human,
+Has no fear,
+Looks surprised,
+When me eats his ear!
+
+Club club club,
+Grab some grub!
+When hunger hits,
+Me likes to club!#{normal}#]],
+}
diff --git a/game/modules/tome/data/lore/lore.lua b/game/modules/tome/data/lore/lore.lua
index 4ca2979f8ac35be4eb1f3e0c715ff9888b5bc621..e2c6db8cc49be7f63a48452840de15e071de704e 100644
--- a/game/modules/tome/data/lore/lore.lua
+++ b/game/modules/tome/data/lore/lore.lua
@@ -22,5 +22,6 @@ load("/data/lore/daikara.lua")
load("/data/lore/old-forest.lua")
load("/data/lore/infinite-dungeon.lua")
load("/data/lore/tol-falas.lua")
+load("/data/lore/fun.lua")
load("/data/lore/sunwall.lua")
load("/data/lore/spellhunt.lua")
diff --git a/game/modules/tome/data/zones/daikara/objects.lua b/game/modules/tome/data/zones/daikara/objects.lua
index 108ab962c33c3c1b758596a2f8f55a05f3ce8763..d03026c2664efa9d3b8fd720e32b99b475198b7c 100644
--- a/game/modules/tome/data/zones/daikara/objects.lua
+++ b/game/modules/tome/data/zones/daikara/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "daikara expedition note", lore="daikara-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],
diff --git a/game/modules/tome/data/zones/old-forest/objects.lua b/game/modules/tome/data/zones/old-forest/objects.lua
index b2b247cb96277206f957bea2e5157be50faa4e8e..11d88edc41b5b9bff12b38a786a32952c2192988 100644
--- a/game/modules/tome/data/zones/old-forest/objects.lua
+++ b/game/modules/tome/data/zones/old-forest/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "journal page", lore="old-forest-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],
diff --git a/game/modules/tome/data/zones/trollshaws/objects.lua b/game/modules/tome/data/zones/trollshaws/objects.lua
index f3741edc0923cf46e6ab7f5cd9b892b87ef86ff9..e40ff113f217c0b71dc7b07e84f12bd5b9b3454e 100644
--- a/game/modules/tome/data/zones/trollshaws/objects.lua
+++ b/game/modules/tome/data/zones/trollshaws/objects.lua
@@ -20,7 +20,7 @@
load("/data/general/objects/objects.lua")
for i = 1, 5 do
-newEntity{ base = "BASE_SCROLL",
+newEntity{ base = "BASE_LORE",
define_as = "NOTE"..i,
name = "tattered paper scrap", lore="trollshaws-note-"..i,
desc = [[A paper scrap, left by an adventurer.]],