diff --git a/lib/Makefile b/lib/Makefile
index 593e0bc..bd45e3d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,5 +1,5 @@
 TOPSRC          = $(shell cd ..; pwd)
-SUBDIR		= startup libc libcurses libtermlib libwiznet libreadline
+SUBDIR		= startup libc libm libcurses libtermlib libwiznet libreadline
 PROG		= ar as aout ld nm ranlib size strip
 
 CFLAGS          += -std=gnu89 -fno-builtin -g -Werror -Wall -DCROSS -I. \
diff --git a/lib/libm/Makefile b/lib/libm/Makefile
new file mode 100644
index 0000000..d8c2e9a
--- /dev/null
+++ b/lib/libm/Makefile
@@ -0,0 +1,18 @@
+TOPSRC          = $(shell cd ../..; pwd)
+include $(TOPSRC)/target.mk
+
+vpath %.c $(TOPSRC)/src/libm
+
+CFLAGS          += -B$(TOPSRC)/lib/ $(DEFS) -Wa,-x -Wall -Werror
+
+OBJS            = asin.o atan.o exp.o erf.o floor.o fmod.o hypot.o j0.o j1.o \
+                  jn.o log.o pow.o sin.o sinh.o sqrt.o tan.o tanh.o
+
+all:            ../libm.a
+
+../libm.a: ../ar ../ranlib $(OBJS)
+		../ar rc $@ $(OBJS)
+		../ranlib $@
+
+clean:
+		rm -f *~ *.o a.out *.a
diff --git a/rootfs.manifest b/rootfs.manifest
index d4bc376..01826a2 100644
--- a/rootfs.manifest
+++ b/rootfs.manifest
@@ -874,6 +874,7 @@ target sys/syslog.h
 #
 file /lib/crt0.o
 file /lib/libc.a
+file /lib/libm.a
 file /lib/libcurses.a
 file /lib/libreadline.a
 file /lib/libtermlib.a
diff --git a/sys/pic32/adc.c b/sys/pic32/adc.c
index 01ea82d..1c9982d 100644
--- a/sys/pic32/adc.c
+++ b/sys/pic32/adc.c
@@ -40,13 +40,13 @@ int adc_open(dev_t dev, int flag, int mode)
     int channel;
 
     channel = minor(dev);
-    if(channel>ADCMAX)
+    if (channel > ADCMAX)
         return ENODEV;
 
     DEBUG1("adc%2: opened\n",channel);
 
     AD1PCFG &= ~(1<<channel);
-    if(adcactive==0)
+    if (adcactive == 0)
     {
         // Enable and configure the ADC here
         AD1CSSL = 0xFFFF;
@@ -65,12 +65,12 @@ int adc_close(dev_t dev, int flag, int mode)
     int channel;
 
     channel = minor(dev);
-    if(channel>ADCMAX)
+    if (channel > ADCMAX)
         return ENODEV;
 
     AD1PCFG |= (1<<channel);
     adcactive &= ~(1<<channel);
-    if(adcactive==0)
+    if (adcactive == 0)
     {
         // Switch off the ADC here.
         AD1CSSL = 0x0000;
@@ -91,25 +91,25 @@ int adc_read(dev_t dev, struct uio *uio, int flag)
     int tv;
 
     channel = minor(dev);
-    if(channel>ADCMAX)
+    if (channel > ADCMAX)
         return ENODEV;
 
     lr = *(&ADC1BUF0+(channel<<2));
 
     c=0;
-    if(lr >= 1000)
+    if (lr >= 1000)
     {
         tv = lr/1000;
         temp[c++] = '0' + tv;
         lr = lr - (tv*1000);
     }
-    if((lr >= 100) || (c>0))
+    if (lr >= 100 || c > 0)
     {
         tv = lr/100;
         temp[c++] = '0' + tv;
         lr = lr - (tv*100);
     }
-    if((lr >= 10) || (c>0))
+    if (lr >= 10 || c>0)
     {
         tv = lr/10;
         temp[c++] = '0' + tv;
@@ -131,12 +131,10 @@ int adc_write(dev_t dev, struct uio *uio, int flag)
 
 int adc_ioctl(dev_t dev, register u_int cmd, caddr_t addr, int flag)
 {
-    switch(cmd)
-    {
-        default:
-            return EINVAL;
+    switch (cmd) {
+    default:
+        return EINVAL;
     }
-
     return 0;
 }
 
@@ -148,9 +146,7 @@ static int
 adcprobe(config)
     struct conf_device *config;
 {
-    int flags = config->dev_flags;
-
-    printf("adc: flags %#x\n", flags);
+    printf("adc: %u channels\n", ADCMAX);
     return 1;
 }
 
diff --git a/sys/pic32/pwm.c b/sys/pic32/pwm.c
index cc69d79..093f769 100644
--- a/sys/pic32/pwm.c
+++ b/sys/pic32/pwm.c
@@ -205,9 +205,7 @@ static int
 pwmprobe(config)
     struct conf_device *config;
 {
-    int flags = config->dev_flags;
-
-    printf("pwm: flags %#x\n", flags);
+    printf("pwm: %u channels\n", PWM_MAX_DEV);
     return 1;
 }