diff -urN ppp-2.4.1/pppd/plugins/Makefile.linux ppp-2.4.1.ppoatm/pppd/plugins/Makefile.linux
--- ppp-2.4.1/pppd/plugins/Makefile.linux	Fri Jun 15 18:55:48 2001
+++ ppp-2.4.1.ppoatm/pppd/plugins/Makefile.linux	Fri Jun 15 18:34:27 2001
@@ -6,7 +6,7 @@
 SUBDIRS := rp-pppoe
 # Uncomment the next line to include the radius authentication plugin
 SUBDIRS += radius
-PLUGINS := minconn.so passprompt.so passwordfd.so
+PLUGINS := minconn.so passprompt.so passwordfd.so pppoatm.so
 
 # include dependencies if present
 ifeq (.depend,$(wildcard .depend))
@@ -16,6 +16,9 @@
 all:	$(PLUGINS)
 	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
 
+pppoatm.so: pppoatm.c
+	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) pppoatm.c -latm
+
 %.so: %.c
 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
 
diff -urN ppp-2.4.1/pppd/plugins/pppoatm.c ppp-2.4.1.ppoatm/pppd/plugins/pppoatm.c
--- ppp-2.4.1/pppd/plugins/pppoatm.c	Thu Jan  1 01:00:00 1970
+++ ppp-2.4.1.ppoatm/pppd/plugins/pppoatm.c	Fri Jun 15 18:50:39 2001
@@ -0,0 +1,226 @@
+/* pppoatm.c - pppd plugin to implement PPPoATM protocol.
+ *
+ * Copyright 2000 Mitchell Blank Jr.
+ * Based in part on work from Jens Axboe and Paul Mackerras.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+#include <atm.h>
+#include <linux/atmdev.h>
+#include <linux/atmppp.h>
+#include <sys/stat.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+#include "pppd.h"
+#include "pathnames.h"
+#include "fsm.h" /* Needed for lcp.h to include cleanly */
+#include "lcp.h"
+
+#define _PATH_ATMOPT         _ROOT_PATH "/etc/ppp/options."
+
+static struct sockaddr_atmpvc pvcaddr;
+static char *qosstr = NULL;
+static int pppoatm_accept = 0;
+static bool llc_encaps = 0;
+static bool vc_encaps = 0;
+static int device_got_set = 0;
+static int pppoatm_max_mtu, pppoatm_max_mru;
+
+static int setdevname_pppoatm(const char *cp);
+
+static option_t my_options[] = {
+	{ "device name", o_wild, (void *) &setdevname_pppoatm,
+	  "Serial port device name",
+	  OPT_DEVNAM | OPT_PRIVFIX | OPT_NOARG  | OPT_A2STRVAL | OPT_STATIC,
+	  devnam},
+#if 0
+	{ "accept", o_bool, &pppoatm_accept,
+	  "set PPPoATM socket to accept incoming connections", 1 },
+#endif
+	{ "llc-encaps", o_bool, &llc_encaps,
+	  "use LLC encapsulation for PPPoATM", 1},
+	{ "vc-encaps", o_bool, &vc_encaps,
+	  "use VC multiplexing for PPPoATM (default)", 1},
+	{ "qos", o_string, &qosstr,
+	  "set QoS for PPPoATM connection", 1},
+	{ NULL }
+};
+
+struct channel pppoatm_channel;
+
+/* returns:
+ *  -1 if there's a problem with setting the device
+ *   0 if we can't parse "cp" as a valid name of a device
+ *   1 if "cp" is a reasonable thing to name a device
+ * Note that we don't actually open the device at this point
+ * We do need to fill in:
+ *   devnam: a string representation of the device
+ *   devstat: a stat structure of the device.  In this case
+ *     we're not opening a device, so we just make sure
+ *     to set up S_ISCHR(devstat.st_mode) != 1, so we
+ *     don't get confused that we're on stdin.
+ */
+static int setdevname_pppoatm(const char *cp)
+{
+	struct sockaddr_atmpvc addr;
+	extern struct stat devstat;
+	if (device_got_set)
+		return 1;
+	info("PPPoATM setdevname_pppoatm");
+	memset(&addr, 0, sizeof addr);
+	if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr),
+	    T2A_PVC | T2A_NAME) < 0)
+		return 0;
+/*	if (!dev_set_ok())
+		return -1;*/
+	memcpy(&pvcaddr, &addr, sizeof pvcaddr);
+	strlcpy(devnam, cp, sizeof devnam);
+	devstat.st_mode = S_IFSOCK;
+	info("PPPoATM setdevname_pppoatm - SUCCESS");
+	the_channel = &pppoatm_channel;
+	device_got_set = 1;
+	return 1;
+}
+
+static void options_for_pppoatm(void)
+{
+	char buf[256];
+
+	snprintf(buf, 256, _PATH_ATMOPT "%s",devnam);
+	if(!options_from_file(buf, 0, 0, 1))
+		exit(EXIT_OPTION_ERROR);
+}
+
+#define pppoatm_overhead() (llc_encaps ? 6 : 2)
+
+static void no_device_given_pppoatm(void)
+{
+	fatal("No vpi.vci specified");
+}
+
+static int connect_device_pppoatm(void)
+{
+	int fd;
+	struct atm_qos qos;
+	struct atm_backend_ppp be;
+
+	fd = socket(AF_ATMPVC, SOCK_DGRAM, 0);
+	if (fd < 0)
+		fatal("failed to create socket: %m");
+	memset(&qos, 0, sizeof qos);
+	qos.txtp.traffic_class = qos.rxtp.traffic_class = ATM_UBR;
+	/* TODO: support simplified QoS setting */
+	if (qosstr != NULL)
+		if (text2qos(qosstr, &qos, 0))
+			fatal("Can't parse QoS: \"%s\"");
+	qos.txtp.max_sdu = lcp_allowoptions[0].mru + pppoatm_overhead();
+	qos.rxtp.max_sdu = lcp_wantoptions[0].mru + pppoatm_overhead();
+	qos.aal = ATM_AAL5;
+	if (setsockopt(fd, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0)
+		fatal("setsockopt(SO_ATMQOS): %m");
+	/* TODO: accept on SVCs... */
+	if (connect(fd, (struct sockaddr *) &pvcaddr,
+	    sizeof(struct sockaddr_atmpvc)))
+		fatal("connect(%s): %m", devnam);
+	pppoatm_max_mtu = lcp_allowoptions[0].mru;
+	pppoatm_max_mru = lcp_wantoptions[0].mru;
+
+	be.backend_num = ATM_BACKEND_PPP;
+	if (!llc_encaps)
+		be.encaps = PPPOATM_ENCAPS_VC;
+	else if (!vc_encaps)
+		be.encaps = PPPOATM_ENCAPS_LLC;
+	else
+		be.encaps = PPPOATM_ENCAPS_AUTODETECT;
+	if (ioctl(fd, ATM_SETBACKEND, &be) < 0)
+		fatal("ioctl(ATM_SETBACKEND): %m");
+
+	return fd;
+}
+
+static void disconnect_device_pppoatm(void)
+{
+/*
+	atm_backend_t be = ATM_BACKEND_RAW;
+	* 2.4 doesn't support this yet *
+	(void) ioctl(fd, ATM_SETBACKEND, &be);
+*/
+}
+
+static void send_config_pppoatm(int mtu, u_int32_t asyncmap,
+	int pcomp, int accomp)
+{
+	int sock;
+	struct ifreq ifr;
+	if (mtu > pppoatm_max_mtu)
+		error("Couldn't increase MTU to %d", mtu);
+	sock = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sock < 0)
+		fatal("Couldn't create IP socket: %m");
+	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
+	ifr.ifr_mtu = mtu;
+	if (ioctl(sock, SIOCSIFMTU, (caddr_t) &ifr) < 0)
+		fatal("ioctl(SIOCSIFMTU): %m");
+	(void) close (sock);
+}
+
+static void recv_config_pppoatm(int mru, u_int32_t asyncmap,
+	int pcomp, int accomp)
+{
+	if (mru > pppoatm_max_mru)
+		error("Couldn't increase MRU to %d", mru);
+}
+
+void plugin_init(void)
+{
+#if _linux_
+	extern int new_style_driver;	/* From sys-linux.c */
+#endif
+	static char *bad_options[] = {
+		"noaccomp", "-ac",
+		"default-asyncmap", "-am", "asyncmap", "-as", "escape",
+		"receive-all",
+		"crtscts", "-crtscts", "nocrtscts",
+		"cdtrcts", "nocdtrcts",
+		"xonxoff",
+		"modem", "local", "sync",
+		NULL };
+#if _linux_
+	if ((!ppp_available() && !new_style_driver))
+		fatal("Kernel doesn't support ppp_generic - "
+		    "needed for PPPoATM");
+#else
+	fatal("No PPPoATM support on this OS");
+#endif
+	info("PPPoATM plugin_init");
+	add_options(my_options);
+	{
+		char **a;
+		for (a = bad_options; *a != NULL; a++)
+			/* remove_option(*a) */;
+	}
+	modem = 0;
+	lcp_wantoptions[0].neg_accompression = 0;
+	lcp_allowoptions[0].neg_accompression = 0;
+	lcp_wantoptions[0].neg_asyncmap = 0;
+	lcp_allowoptions[0].neg_asyncmap = 0;
+	lcp_wantoptions[0].neg_pcompression = 0;
+}
+
+struct channel pppoatm_channel = {
+    options: my_options,
+    process_extra_options: options_for_pppoatm,
+    check_options: NULL,
+    connect: &connect_device_pppoatm,
+    disconnect: &disconnect_device_pppoatm,
+    establish_ppp: &generic_establish_ppp,
+    disestablish_ppp: &generic_disestablish_ppp,
+    send_config: &send_config_pppoatm,
+    recv_config: &recv_config_pppoatm,
+    close: NULL,
+    cleanup: NULL
+};
+