diff --git a/assets/mods/basegame/audio/ambient/season/autumn.1.ogg b/assets/mods/basegame/audio/ambient/season/autumn.1.ogg
deleted file mode 100644
index ad97b46d7..000000000
--- a/assets/mods/basegame/audio/ambient/season/autumn.1.ogg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4106ad46632a2e924f98c8129d0ead674d6ed8915c501d3db3f73a4a83e6936f
-size 5173445
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.1.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.1.ogg
new file mode 100644
index 000000000..14dd0eb48
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10b7fbb017fd8a4899bdb58ffc4260c883dc74af14e165d6c21babaadedd3c49
+size 1782474
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.2.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.2.ogg
new file mode 100644
index 000000000..577cedb98
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e05a09fdbee53a1aa3367dcd1024616f361a64c683fe41f331b3c88c4831c24e
+size 1760613
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.3.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.3.ogg
new file mode 100644
index 000000000..42ad680c7
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.3.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e60aa3c1e901936fa280e4301d74403f17f3ba80d6ec4c9c372d3fae2904b34a
+size 1774158
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.4.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.4.ogg
new file mode 100644
index 000000000..2b513cefc
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.4.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04a918cb774a3a930a816f1f8736db90f80e030bcd325dc81b7a877f4996d915
+size 1667243
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.5.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.5.ogg
new file mode 100644
index 000000000..8f6a0f8cc
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.5.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7516006fd0633ba27918f0b2d1b7d7665c219b407fc1eed5fba6abe32c3c1972
+size 1707060
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.6.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.6.ogg
new file mode 100644
index 000000000..c1d459070
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.6.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14039a182a8214f08135e8e7dea7e1e412b3f7b20c401261c507fd1922b9c587
+size 1704040
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.7.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.7.ogg
new file mode 100644
index 000000000..f70515503
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.7.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:709e9a3875467c3c3f9509a8333b7416d3b7fcbedbee82f51211951238f8dcb5
+size 1399286
diff --git a/assets/mods/basegame/audio/ambient/season/crepuscular_summer.8.ogg b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.8.ogg
new file mode 100644
index 000000000..97bde55f9
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/crepuscular_summer.8.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bd3d218ecbc0d42adbfcd718b0a367a4b8dbef2bc5661d811d15973a521e896
+size 1376817
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_autumn.1.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_autumn.1.ogg
new file mode 100644
index 000000000..ce8eadcd4
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_autumn.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36ef0ccaa2250d29e46aa7d4cf99284494326922ac03446c99c1ba8bbc4a9a88
+size 6717498
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_autumn.2.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_autumn.2.ogg
new file mode 100644
index 000000000..60a2697d9
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_autumn.2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ba9d2d89934feab6297a594d0258a377b715f08577a7294d9422260b9e58927
+size 6841868
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_spring.1.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_spring.1.ogg
new file mode 100644
index 000000000..ec101e368
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_spring.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a8fdfd646f56c39738a05a720e13603fb666f989ddbdde0ee5e8923bee3a631
+size 9360559
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_spring.2.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_spring.2.ogg
new file mode 100644
index 000000000..5a7d02682
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_spring.2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6dcd5ae16621466339f45291d0e29abea2b763e3929147f04fc7c45547a15387
+size 9395033
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_spring.3.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_spring.3.ogg
new file mode 100644
index 000000000..10c0880cf
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_spring.3.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef600248c6a2a095c70ed08f6ec99433c3d6d08146b0eb5d013466b2b9c4d475
+size 9459932
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_spring.4.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_spring.4.ogg
new file mode 100644
index 000000000..bf0572218
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_spring.4.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c115b0d55fde9e1925a04bf441f136ff6d7a2a6c78ea1a73e7ec12eff6457ec
+size 9497207
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_spring.5.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_spring.5.ogg
new file mode 100644
index 000000000..a00308a3b
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_spring.5.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9b30668d023092b5cf7d8a13ab60ed0ddd68e51093e041d2ca48b5c59b89115
+size 9428675
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_summer.1.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_summer.1.ogg
new file mode 100644
index 000000000..cdbf457fe
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_summer.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1fe6ddc357656d21f80fb10c7b5720cc4c8b661115fd2db5cccf2b34fa593e2
+size 8906365
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_summer.2.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_summer.2.ogg
new file mode 100644
index 000000000..d2d706aca
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_summer.2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0684e3cd31d7186b3e18ee4c71b32ac39eb59f0b5e8b94d573dc9e69a020de9
+size 9097480
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_winter.1.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_winter.1.ogg
new file mode 100644
index 000000000..58d6a2e11
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_winter.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:800b5ad0185e6543ab64cfaa3884bad3725513ff08db5c418a77ddca59b6703e
+size 4915452
diff --git a/assets/mods/basegame/audio/ambient/season/diurnal_winter.2.ogg b/assets/mods/basegame/audio/ambient/season/diurnal_winter.2.ogg
new file mode 100644
index 000000000..ea34e3641
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/diurnal_winter.2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f653cb69379b8ad31eec60a1f2817e43c62925947fba0b762715651f18847ae
+size 5027380
diff --git a/assets/mods/basegame/audio/ambient/season/nocturnal_summer.1.ogg b/assets/mods/basegame/audio/ambient/season/nocturnal_summer.1.ogg
new file mode 100644
index 000000000..ace159342
--- /dev/null
+++ b/assets/mods/basegame/audio/ambient/season/nocturnal_summer.1.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4308ab6ec36d8ece2646769da6e09bb2ed18c5e0bbdcd8cf128494041896211d
+size 8216005
diff --git a/assets/mods/basegame/audio/ambient/season/summer.1.ogg b/assets/mods/basegame/audio/ambient/season/summer.1.ogg
deleted file mode 100644
index 15f76ed2e..000000000
--- a/assets/mods/basegame/audio/ambient/season/summer.1.ogg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72175b849610a426f0fa33420e71e21028e82404445df60cb0fc61041de2c88e
-size 5424074
diff --git a/assets/mods/basegame/audio/ambient/season/winter.1.ogg b/assets/mods/basegame/audio/ambient/season/winter.1.ogg
deleted file mode 100644
index f975b79d7..000000000
--- a/assets/mods/basegame/audio/ambient/season/winter.1.ogg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dddc2bf3533e317e94cb16665c86ef1a661dc864d6252e99ca2f72851978342c
-size 5723437
diff --git a/src/net/torvald/terrarum/CreditSingleton.kt b/src/net/torvald/terrarum/CreditSingleton.kt
index 989cf6b88..f7efc2fdf 100644
--- a/src/net/torvald/terrarum/CreditSingleton.kt
+++ b/src/net/torvald/terrarum/CreditSingleton.kt
@@ -273,14 +273,14 @@ limitations under the License.
 
 $BULLET Ambient sound recordings:
 
-    - ambient_forest_01.ogg
-    - ambient_meadow_01.ogg
-    - ambient_windy_01.ogg
-    - ambient_woods_01.ogg
-    - crickets_01.ogg
-    - crickets_02.ogg
+    - ambient/season/crepuscular_summer.*.ogg
+    - ambient/season/diurnal_autumn.*.ogg
+    - ambient/season/diurnal_spring.*.ogg
+    - ambient/season/diurnal_summer.*.ogg
+    - ambient/season/diurnal_winter.*.ogg
+    - ambient/season/nocturnal_summer.*.ogg
 
-Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
+Copyright (C) 2013, 2015, 2020, 2021 Klankbeeld
 Sound from <https://www.freesound.org/people/klankbeeld>
 
 
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
index 0dbe9fd61..de5eaec1d 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
@@ -415,14 +415,16 @@ class TerrarumMusicGovernor : MusicGovernor() {
                     ambFired = true
 
                     val season = ingame.world.worldTime.ecologicalSeason
+                    val time = ingame.world.worldTime.todaySeconds // 0 until DAY_LENGTH (86400)
                     val seasonName = when (season) {
                         in 0f..2f -> "autumn"
                         in 2f..3f -> "summer"
                         in 3f..5f -> "autumn"
                         else -> "winter"
                     }
+                    val timeMode = "diurnal"
 
-                    val track = ambients["ambient.season.$seasonName"]!!.random()
+                    val track = ambients["ambient.season.${timeMode}_$seasonName"]!!.random()
                     startAmbient(track)
                 }
             }