diff --git a/changelog.txt b/changelog.txt
index 21b3893..6b97cfc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,8 @@
 2015-09-25: Reworked: default mineral/ore images, glowstone/nether 
 glowstone, default cobble, default stone and desert stone and various 
 images derived from them (twice), all "mossy" images, gloopblocks 
-basalt, gravel and building_blocks gravel spread.  Tweaked acacia wood.
+basalt, obsidian, gravel, building_blocks gravel spread.  Tweaked acacia 
+wood.
 
 2015-09-24: Added partial support for valleys mapgen, totally reworked 
 moretrees fir needles, reworked default clay and unified bricks 
diff --git a/default_obsidian.png b/default_obsidian.png
index 16c5b3b..0bef2ed 100644
Binary files a/default_obsidian.png and b/default_obsidian.png differ
diff --git a/default_obsidian_glass.png b/default_obsidian_glass.png
index 50f38cf..aa13e06 100644
Binary files a/default_obsidian_glass.png and b/default_obsidian_glass.png differ
diff --git a/image-credits.txt b/image-credits.txt
index 94a5476..602883c 100644
--- a/image-credits.txt
+++ b/image-credits.txt
@@ -695,8 +695,8 @@ Gloopblocks
 Basalt:
 http://commons.wikimedia.org/wiki/File:G%C3%A9oscope-_Basalt_%28Doleritic%29_4393.JPG
 
-Obsidian:
-http://commons.wikimedia.org/wiki/File:Obsidian_1.jpg
+Obsidian / obsidian glass:
+https://commons.wikimedia.org/wiki/File:Lipari-Obsidienne_(5).jpg
 
 Pumice:
 http://commons.wikimedia.org/wiki/File:Pumice_stone_detail444.jpg