diff --git a/net/ipsec/aes/ipsec_alg_aes.c b/net/ipsec/aes/ipsec_alg_aes.c
index 6fe071f..593f55f 100644
--- a/net/ipsec/aes/ipsec_alg_aes.c
+++ b/net/ipsec/aes/ipsec_alg_aes.c
@@ -59,11 +59,11 @@ static int keyminbits=0;
 static int keymaxbits=0;
 #if defined(CONFIG_KLIPS_ENC_AES_MODULE)
 MODULE_AUTHOR("JuanJo Ciarlante <jjo-ipsec@mendoza.gov.ar>");
-MODULE_PARM(debug_aes, "i");
-MODULE_PARM(test_aes, "i");
-MODULE_PARM(excl_aes, "i");
-MODULE_PARM(keyminbits, "i");
-MODULE_PARM(keymaxbits, "i");
+module_param(debug_aes,int,0664);
+module_param(test_aes,int,0664);
+module_param(excl_aes,int,0664);
+module_param(keyminbits,int,0664);
+module_param(keymaxbits,int,0664);
 #endif
 
 #if CONFIG_KLIPS_ENC_AES_MAC
@@ -79,7 +79,11 @@ static int auth_id=0;
 #else
 static int auth_id=9;
 #endif
-/* MODULE_PARM(auth_id, "i"); */
+#ifdef MODULE_PARM
+MODULE_PARM(auth_id, "i");
+#else
+module_param(auth_id,int,0664);
+#endif
 #endif
 
 #define ESP_AES			12	/* truely _constant_  :)  */
diff --git a/net/ipsec/ipsec_alg_cryptoapi.c b/net/ipsec/ipsec_alg_cryptoapi.c
index 954ad78..69b88d7 100644
--- a/net/ipsec/ipsec_alg_cryptoapi.c
+++ b/net/ipsec/ipsec_alg_cryptoapi.c
@@ -34,7 +34,7 @@ #include <linux/version.h>
  *	special case: ipsec core modular with this static algo inside:
  *	must avoid MODULE magic for this file
  */
-#if CONFIG_KLIPS_MODULE && CONFIG_KLIPS_ENC_CRYPTOAPI
+#if defined(CONFIG_KLIPS_MODULE) && defined(CONFIG_KLIPS_ENC_CRYPTOAPI)
 #undef MODULE
 #endif
 
@@ -96,14 +96,14 @@ #define DIGESTNAME_SHA1		"sha1"
 
 MODULE_AUTHOR("Juanjo Ciarlante, Harpo MAxx, Luciano Ruete");
 static int debug_crypto=0;
-MODULE_PARM(debug_crypto, "i");
+module_param(debug_crypto, int, 0664);
 static int test_crypto=0;
-MODULE_PARM(test_crypto, "i");
+module_param(test_crypto, int, 0664);
 static int excl_crypto=0;
-MODULE_PARM(excl_crypto, "i");
+module_param(excl_crypto, int, 0664);
 
 static int noauto = 0;
-MODULE_PARM(noauto,"i");
+module_param(noauto,int, 0664);
 MODULE_PARM_DESC(noauto, "Dont try all known algos, just setup enabled ones");
 
 #ifdef CONFIG_KLIPS_ENC_1DES
@@ -117,14 +117,14 @@ static int serpent[] = {-1, -1};
 static int twofish[] = {-1, -1};
 
 #ifdef CONFIG_KLIPS_ENC_1DES
-MODULE_PARM(des_ede1,"1-2i");
+module_param_array(des_ede1,int,NULL,0);
 #endif
-MODULE_PARM(des_ede3,"1-2i");
-MODULE_PARM(aes,"1-2i");
-MODULE_PARM(blowfish,"1-2i");
-MODULE_PARM(cast,"1-2i");
-MODULE_PARM(serpent,"1-2i");
-MODULE_PARM(twofish,"1-2i");
+module_param_array(des_ede3,int,NULL,0);
+module_param_array(aes,int,NULL,0);
+module_param_array(blowfish,int,NULL,0);
+module_param_array(cast,int,NULL,0);
+module_param_array(serpent,int,NULL,0);
+module_param_array(twofish,int,NULL,0);
 MODULE_PARM_DESC(des_ede1, "0: disable | 1: force_enable | min,max: dontuse");
 MODULE_PARM_DESC(des_ede3, "0: disable | 1: force_enable | min,max: dontuse");
 MODULE_PARM_DESC(aes, "0: disable | 1: force_enable | min,max: keybitlens");