diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 699df767c..0f355aa53 100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -27,6 +27,8 @@
 #include <grub/list.h>
 #include <grub/loader.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 struct grub_ahci_cmd_head
 {
   grub_uint32_t config;
diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c
index 07632e635..58dc98f34 100644
--- a/grub-core/fs/romfs.c
+++ b/grub-core/fs/romfs.c
@@ -24,6 +24,8 @@
 #include <grub/fs.h>
 #include <grub/fshelp.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 struct grub_romfs_superblock
 {
   char magic[8];
diff --git a/grub-core/lib/ia64/setjmp.S b/grub-core/lib/ia64/setjmp.S
index 0851885c5..190623d35 100644
--- a/grub-core/lib/ia64/setjmp.S
+++ b/grub-core/lib/ia64/setjmp.S
@@ -64,6 +64,12 @@
   	0x1b0	f30
   	0x1c0	f31 */
 
+#include <grub/symbol.h>
+#include <grub/dl.h>
+
+	.file	"setjmp.S"
+
+GRUB_MOD_LICENSE ("GPLv2+")
 
 	/* The following two entry points are the traditional entry points: */
 
diff --git a/grub-core/loader/i386/pc/freedos.c b/grub-core/loader/i386/pc/freedos.c
index 0ae815490..f796e08f4 100644
--- a/grub-core/loader/i386/pc/freedos.c
+++ b/grub-core/loader/i386/pc/freedos.c
@@ -33,6 +33,8 @@
 #include <grub/mm.h>
 #include <grub/cpu/relocator.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 static grub_dl_t my_mod;
 static struct grub_relocator *rel;
 static grub_uint32_t ebx = 0xffffffff;
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
index b018e4549..247eebae5 100644
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -31,6 +31,8 @@
 #include <grub/efi/efi.h>
 #include <grub/elf.h>
 
+GRUB_MOD_LICENSE ("GPLv3+");
+
 #define ALIGN_MIN (256*1024*1024)
 
 #define GRUB_ELF_SEARCH 1024
diff --git a/grub-core/video/colors.c b/grub-core/video/colors.c
index 0637c5508..3119c0249 100644
--- a/grub-core/video/colors.c
+++ b/grub-core/video/colors.c
@@ -21,6 +21,9 @@
 #include <grub/gui.h>
 #include <grub/gui_string_util.h>
 #include <grub/misc.h>
+#include <grub/dl.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
 
 struct named_color
 {
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 5ce01199c..75cd71758 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -90,6 +90,9 @@ static const char grub_module_name_##name[] \
 #ifndef ASM_FILE
 #define GRUB_MOD_LICENSE(license)	\
   static char grub_module_license[] __attribute__ ((section (GRUB_MOD_SECTION (module_license)), used)) = "LICENSE=" license;
+#define GRUB_MOD_DEP(name)	\
+static const char grub_module_depend_##name[] \
+ __attribute__((section(GRUB_MOD_SECTION(moddeps)), __used__)) = #name
 #else
 #define GRUB_MOD_LICENSE(license)	\
   .section GRUB_MOD_SECTION(module_license), "a";	\